Revert "Track NFC legacy branch"

This reverts commit 26e16438d268af6223063c15771b1b640409863b.