Revert "Merge pull request #524 from alameluchidambaram/CONN-517"

This reverts commit 7f381cd6ed06acdf55c123d8450e9a5ddf0b7875, reversing
changes made to 374d8bc9fb7a6f6a1000d62bc464a991425188da.