Handle retries in a much more reasonable way.