Add preliminary support for 802.11s
Revert "Add preliminary support for 802.11s"

This reverts commit 88bb0762e8fdc7434805f444f626ba44901b59ad.