This reverts commit d1dc579062, reversing changes made to 3a73048bc9. Said commit caused regressions in dtests. We need to investigate and fix those, but in the meanwhile let's revert this to reduce the disruption to our workflows. Refs: #14283
d1dc579062
3a73048bc9