First pass - attempt to use delivery state for retry logic. Fail utterly.