Continued cleanup of net module to clean up regressions introduced with
the Netty port.