put back changes removed in sha: 1cb82084 and sha:76c21c6e
(i was on the wrong branch)
to check is the worst-case has been reached