Retries take 4

I'm not sure why github says this can't be merged automatically, but at least the diff is clear.