Revert "MORE NFC leftovers!"

This reverts commit 7ee1b739b27807c93bb61f42bc4c1dedb0524bfc