Revert "socket fixup"

This reverts commit e7c8844f03c957144269b18532f192d2f1d21de3.