Revert "Wimax: Squashed commit of the following:"

This reverts commit c74ef86b38a2b9a7b60df9fd62db64f5a7c6c4c0.