Revert "Switch to common_wifi_only"

This reverts commit 60f3c0b1c3ba63bdf23cd13af6739056a936360f.