Revert "Second try at socket"