This reverts commit 5eb81a4b40, reversing
changes made to c6806434e7 and
this reverts commit 679ff61123.
What happend is git rebase --rebase-merges doesn't do what is expected.
Start tracking upstream development of hostapd and wpa_supplicant more
closely. The last upstream release is from August 2019. Keeping up
with upstream development will make importing releases less exciting.
Discussed with: cy
Sponsored by: Rubicon Communications, LLC ("Netgate")