Revert "Rearrange function calls for wireless to prevent killing hostapd/wpa_supplicant at the wrong time."
This reverts commit e93385d06ddf0e2888b3f5ee5764992a19f99120.
Revert "Rearrange function calls for wireless to prevent killing hostapd/wpa_supplicant at the wrong time."
This reverts commit e93385d06ddf0e2888b3f5ee5764992a19f99120.