In a couple of places when the peer is discovered to be dead, make sure to set the remote dropped error to handle health correctly.