commit before rollback
Revert "commit before rollback"

This reverts commit 507f8c74f3fc4ef6fa7f53ae35537ab57182ce74.