Revert to wext

Change-Id: Ieffaf53cab542ecbc962922d4da7c7ec9116afe8