Given the large number of HTTP response fixes we have added, I believe the per-operation retry should suffice and we can remove the outer retry loop.  We can address this in a subsequent commit.