Revert "Attempt to fix WiFi"

This reverts commit 232b830a767416c4707caca0e0a26e962a19f55d.
Adding in previous wifi fix for ICS with upadated headers

Change-Id: Iebf21d2a9a28c6d5ba01885d6f9cc1906c4dc401