Since we're moving away from socket-based communication, I'm undoing some of the modifications made to the socket class.