Fix fallout from part 1 of PR25561 patch.