Revert "Merge pull request #67 from rinrinne/connection-changes"

This reverts commit 8b43697d4db690de45cf153a0ebf5ede4fab4bed, reversing
changes made to 028eb17efe1e456a2dd4316a4cb74385745ea302.
Fixing a test regression