Turns out we don't need this retry loop, so please revert that part of the change back.