Don't cause an infinite loop
Revert "Don't cause an infinite loop"

This reverts commit b3a49ea11b97eac0a9e5b20942c9dcc9792ba80a.
Merge branch 'wrap-socket-connectivity-errors' into all-of-the-updated-pull-requests