Revert back to using sockets