Revert "safety checkpoint from vm"

This reverts commit b9c893db281d7049a49deb8dc6d13f4e047ff98f.

The checkpoint commit was a bit too broad in its changes.