better disconnection behavior (possibly at the expense of failure on reconnects)