This reverts commit 32fff17e19, reversing changes made to 164afe14ad. This series proved to be problematic, the new test introduced by it failing quite often. Revert it until the problems are tracked down and fixed.
32fff17e19
164afe14ad