Renamed orig_cmd to orig_cmd_value in 5071b0d628.