Revert "Merge pull request #640 from christophermay07/CONN-727"

This reverts commit 4bcf33495a5088a9ea7dd219c4bb64d5977a9c2f, reversing
changes made to a1420568a90e4d5a0c97760c3b3921b560c49312.