Revert 9fb01c4..e64da9a

This rolls back to commit 9fb01c42033ddaac4ba8d920505ff1c6d6f4d6f9.
Connection with server