To make sure changes in 35d1cd0 don't break anything. Refs #19505. ad769efa85e0296033572315025fed9fa9aefade from master.