Reverting NFC changes from r218050. Instead, the warning was disabled for GCC in...