Revert "[TEST] Wi-Fi fixes"

This reverts commit 429711b3f69b361d7b0a1e8ce1192b8d42e6e004.