revert to commit_on_success