Revert the change made for TRQ-1961. This change made it so that I couldn't get my server to listen for connections.