Socket still silently dies

This reverts commit 7d9e724305a76b1521a7b3ea70393b72ec6c992f.
More aggressively close sockets