This reverts commit628e6ffd33, reversing changes made to45ec76cfbf. The test included with this PR is flaky and often breaks CI. Revert while a fix is found. Fixes: #15371
This reverts commit628e6ffd33, reversing changes made to45ec76cfbf. The test included with this PR is flaky and often breaks CI. Revert while a fix is found. Fixes: #15371