This is causing pretty bad fail to reconnect issues This reverts commit 252a77fd97, reversing changes made to a611a5d252.
252a77fd97
a611a5d252