Apply the same fix in r274697 to the ARM case.