Revert Moving NFC Stuff