Revert many,many net-related changes to fix WiFi