fixup key ordering in migration for 3.4