Merge "Revert "server: Whitelist non-INTERNET/non-CELLULAR Network...""