Dropped the TODO in network.cc, it was wrong.