Ok I'll revert that commit. No, I don't think it's worth complexity of retrying on failures. Our poll interval was already 120s so it's "ok".