Regression introduced by commit 9777442. Refs #21410. Backport of d3b71b976d from master
9777442
d3b71b976d