Revert "Base: Wi-Fi country code (2 of 2)"

This reverts commit 657b4ab7f1ce9681415bcee61ca2acbb19a4f97e.

Change-Id: I924b7b5aa83f07101559df8a9749aa6e2f614406