Merge pull request #2009 from TheBlueMatt/2023-02-no-racey-retries