Reverting to before sockets for testing