This reverts commit 94ed2caf70. The issue with no-determinism with the test has been fixed in d9526e8a52.
94ed2caf70
d9526e8a52