Reverted commit 5484 as the code is required to properly know the connection status