Revert to 2.1.x rollback behavior and jury rig the test cases to pass (full disclosure - didn't try to figure out why they didn't) so that update is compatible with MySQL