This reverts commit 11cafd2fc8, reversing changes made to 2bae14f743. Reverting because this series causes frequent CI failures, and the proposed quickfix causes other failures of its own. Fixes: #16113
11cafd2fc8
2bae14f743