This reverts commit 98c3540d. Revert needed due Wifi Offload service crashing device and cause soft reboot