Revert "reconcile kltevzw w/ cm -- prebuilt (but working) nfc is fine by me"

This reverts commit 6bcc6608e791d1ff53b969b4776a3b4dec8ec193.