Sure, that makes sense.

Should we merge this and then address the don't-retry-forever issue in a follow-up commit?