Revert : Wi-Fi tether fixes