diff --git a/keystone/common/sql/migrate_repo/versions/020_migrate_metadata_table_roles.py b/keystone/common/sql/migrate_repo/versions/020_migrate_metadata_table_roles.py
index 4d0f9dfcf2..b60dacb113 100644
--- a/keystone/common/sql/migrate_repo/versions/020_migrate_metadata_table_roles.py
+++ b/keystone/common/sql/migrate_repo/versions/020_migrate_metadata_table_roles.py
@@ -70,12 +70,11 @@ def downgrade(migrate_engine):
         'metadata',
         meta,
         sql.Column(
-            'user_id',
+            u'user_id',
             sql.String(64),
-            sql.ForeignKey('user.id'),
             primary_key=True),
         sql.Column(
-            'tenant_id',
+            u'tenant_id',
             sql.String(64),
             primary_key=True),
         sql.Column('data',