Revert "wifi and bluetooth changes"

This reverts commit 6fba0b322d918fd187a026432ca523d61c123df8.