Revert "savepoint"

This reverts commit 135e57c6f00ff6dcac569d19db72b29a5a69ec3c.