Revert: wifi commits (reverted from commit 6d16b55ef3f44ae1147135e03ce73f2bd45b57cb)