Followup r92796, r93002