This corresponds to the earlier patch for arm_extract_return_value.