Revert "Remove Checkpoints"

This reverts commit a5e10c59b853eb0dc4059fc7030e75e470f52c65.