Fixed wifi (reverted wifi patches)

Change-Id: I2b82d7a77bcded7d7f236de9c22d5f94a9d331b8