Revert "Added fix for connection close related issue"

This reverts commit 8ecc9a14e3932650ae4ce80f2f7254afbb71b930.