After v7.1.0 and before Fulu, we should revert the change introduced in this PR:
More background:
This will depend on checkpointz being updated and that update being widely adopted. I don't think there is an open PR to fix checkpointz yet, but I've opened an issue: