Revert "Commit before rollback."

This reverts commit 5422f4e50d77d88ba191afdad179f2c8bbf1a64c.