Revert "Wimax: Squashed commit of the following:"

This reverts commit af02125fea2592b785f7bbe692a15c59f772ec37.