Initial work to disable FCN_OLD.