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