Followup r74234 flip parameters