Fixed regressions from 36ded01527b690b5df0574492af9cfcc2ea3d1dc.

Refs #21302