This partially reverts commit bc7d201b. Thanks Tim for the review. Refs #25858. Backport of 0223e213 from master