AWS retries

Tested locally.

Should make Amazon happy in 175507761.