There was a misunderstanding as to whether we wanted those base NFC changes or not. This reverts commit 166074ef.