Reverted bad-merge where networking code was deleted