Revert "Merge fixes"

Reverts dz0ny/rt8192cu#7