Rolling back the NFC, again

Rolling back the NFC, again