Revert "Wireless Upgrade Part_2"

This reverts commit 791391bc3967efcf170c7660cfb63b1bff9a3a0f.
Revert "Wireless Upgrade"

This reverts commit b7651bdc058fc7a584ce0f38e06d9d3f2d88a8f7.