mac80211: replace the previous fix with a revert of the faulty upstream commit