On several tested samples we now take between 1.8s and 3s instead of 33s to 38s.
This will create a new commit in order to revert the existing changes.
