Revert "Added fix for connection close related issue"

This reverts commit 432f3fb44eb65d01ff07b74e1f2fd35b07db62e8.