Revert to arm7-a compat flags