Revert some WiFi commits