This change is not fixing tests but rather increasing their duration, so we're reverting this change as a result.