Revert "Client Socket Fix"

This reverts commit e3bf45835121072847ae8aa9c3fc4618409b76f6.