Revert "Merge branch 'fix-retry-auth-error' into develop"

This branch is failing multiple S3 integration tests and needs
investigation.

This reverts commit 791cfdcf8dd08ded1b65e2dfd5d684aa2fddea0a, reversing
changes made to e754fc0d7b4a51dc1ac11c8fc5916873ce458526.