This reverts commit 628e6ffd33, reversing changes made to 45ec76cfbf. The test included with this PR is flaky and often breaks CI. Revert while a fix is found. Fixes: #15371
628e6ffd33
45ec76cfbf