Revert "CONN-746"

This reverts commit 8bd236aad845f806d65667c5bcd1a171720a35a3.