Fix ARM and Power with respect to 70890a17.