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