diff --git a/data/database.py b/data/database.py
index b9716bf0f..aba62b88b 100644
--- a/data/database.py
+++ b/data/database.py
@@ -168,7 +168,6 @@ class Visibility(BaseModel):
 
 
 class Repository(BaseModel):
-  namespace = CharField()
   namespace_user = ForeignKeyField(User)
   name = CharField()
   visibility = ForeignKeyField(Visibility)
@@ -180,7 +179,6 @@ class Repository(BaseModel):
     read_slaves = (read_slave,)
     indexes = (
       # create a unique index on namespace and name
-      (('namespace', 'name'), True),
       (('namespace_user', 'name'), True),
     )
 
diff --git a/data/model/legacy.py b/data/model/legacy.py
index 07c8b9e2a..3da6440cb 100644
--- a/data/model/legacy.py
+++ b/data/model/legacy.py
@@ -1082,8 +1082,7 @@ def __apply_default_permissions(repo, proto_query, name_property,
 def create_repository(namespace, name, creating_user, visibility='private'):
   private = Visibility.get(name=visibility)
   namespace_user = User.get(username=namespace)
-  repo = Repository.create(namespace=namespace, name=name, visibility=private,
-                           namespace_user=namespace_user)
+  repo = Repository.create(name=name, visibility=private, namespace_user=namespace_user)
   admin = Role.get(name='admin')
 
   if creating_user and not creating_user.organization: