Revert some wifi fixes

That didn't work. Will try again when I have some free time.