ENG-6375 Retry #3 of retry logic fix