This partially reverts commit bc7d201b. Thanks Tim for the review. Refs #25858.
mentioned in commit 48cf7516