Revert "Improve NFC operation"

This reverts commit 5488a7ed9f124793d90e6b0a08e771e9b8612890.