This branch fixes inconsistent (and unexplained) random test failures
This will create a new commit in order to revert the existing changes.