Followup r78268, do it as Bryan suggested, not as how I'd interpretted it for some...