revert socket fix

@samshull @nherment 

Reverting this so that work can continue. I am looking at this issue today to find another fix.