[FIXUP] Reverted a bad merge in ARM config.