Temporary revert of net.cpp to wave 1 of cleanups