Reverting NFC changes from r218050. Instead, the warning was disabled for GCC in r218059, so these changes are no longer required.