chore(patches): revert the "respect max retries" patch

We have discovered potential segfault risk with the feature and we do
not have enough time to review this in more depth, therefore we have
decided to revert the change temporarily to further investigate.

FTI-5616