Revert "consistancy fixes for sockets"

This reverts commit f322de9995472f436fedbf87322efdf1e02cc512.