Merge pull request #1 from andros11/kk

NH2: WiFi
Revert "NH2: WiFi"

This reverts commit f3916908650c99e464c6c963e8e0841ec97e141e.