Remove some over eager reconnect behavior.
Add message buffering during reconnects.