Revert "Fix retry counting"

This reverts commit 30894a9f50028e6f2f21e890679b9bed7e5a7cd0.