Revert "Temporarily fix for at&t variant NFC use firmware on chip"

This reverts commit 7819904829e8e98e8f5e5d975612629b81a39d62.