More re-enable of NFC