ENG-6375 Yet another retry fix. Sigh.