Bug 18620: [QA Follow-up] Move the final rollback to the very end