Simplifying TCPForwarder and TCPServer
Revert "Simplifying TCPForwarder and TCPServer"

This reverts commit 4785ed5786fa71ea9b3445922cdab3187cb2c7c9.