Revert "defconfig: Updates for WLAN on the jb_2.5 branch"

This reverts commit aaa605392c8d255b630bb2492593333f786ee34d.