Hack reconnect logic to be slightly less broken