Fix a regression from r24808: