Simplifying retry logic; should fix sentry 537.