Get rid of retries loop and related bug.