Revert "Checkpoint Merge"

This reverts commit e57e643b6a33ccd70125d741d865d5ac35aa69c6.