undo of sock cleanup
Merge branch 'aftersockcleanup' into Prod