Revert "[HACK] temporarily work around wifi issue that some users are having"

This reverts commit 712435b3687eff75f08047f663320816d9b5d844.