ENG-5769 More retry logic cleanup.