Revert "Merge remote-tracking branch 'origin/Networking' into Networking"

This reverts commit dbb0a6d6ad1b0ca6546f33af061895c1f413b342, reversing
changes made to d3123fa28adfe24acbbd8307cc043ebdfb2e350d.