Some tests become flaky since a recent clean up
This will create a new commit in order to revert the existing changes.
