Revert "Wifi driver tweaks"

This reverts commit 2d3ddd9deae45c0b7f399de5a7b38aae171f4fc5.