Once the retry work is completed, we can replace custom manual retries with the library's retries
Once the retry work is completed, we can replace custom manual retries with the library's retries