Reverted checkpoints to be less resource intensive