This reverts commit r37926.
It seems to trigger some weird issues in hostapd that should be
investigated first

SVN-Revision: 37928