This reverts commit 2866824b51.
2866824b51
This might or might not give more information on randomly failing tests on CI /cc @leodemoura