Revert "wifi changes part 2"

This reverts commit 063aa6fef52af7876bdd25aa0866eac2c1aed496.
Revert "wifi changes"

This reverts commit 357e967898f3b8958ca807f62802755d628371ed.