Bug 23177: (QA follow-up) Move rollback to the end