[AC] Reinstate lost changes to fsf-compat