re Bug #29283, r101507: Apply Vitaliy Filippov's followup fix: