Bug 31894: (QA follow-up) Move rollbacks to the end