We see internal server errors occasionally; and it's very annoying to
have to re-run the entire step

Release Notes:

- N/A