Revert "move socket"

This reverts commit fcc049a45f240af530cbf8b82458c5f3cd27d785.