diff --git a/pisi/db/componentdb.py b/pisi/db/componentdb.py
index 7200f30a..337ded66 100644
--- a/pisi/db/componentdb.py
+++ b/pisi/db/componentdb.py
@@ -33,10 +33,10 @@ class ComponentDB(lazydb.LazyDB):
         component_packages = {}
         component_sources = {}
 
-        self.repodb = pisi.db.repodb.RepoDB()
+        repodb = pisi.db.repodb.RepoDB()
 
-        for repo in self.repodb.list_repos():
-            doc = self.repodb.get_repo_doc(repo)
+        for repo in repodb.list_repos():
+            doc = repodb.get_repo_doc(repo)
             component_nodes[repo] = self.__generate_components(doc)
             component_packages[repo] = self.__generate_packages(doc)
             component_sources[repo] = self.__generate_sources(doc)
@@ -109,7 +109,7 @@ class ComponentDB(lazydb.LazyDB):
         component = pisi.component.Component()
         component.parse(self.cdb.get_item(component_name))
         
-        for repo in self.repodb.list_repos():
+        for repo in pisi.db.repodb.RepoDB().list_repos():
             try:
                 component.packages.extend(self.cpdb.get_item(component_name, repo))
             except Exception: #FIXME: what exception could we catch here, replace with that.
diff --git a/pisi/db/groupdb.py b/pisi/db/groupdb.py
index ea8c50fb..503c51c4 100644
--- a/pisi/db/groupdb.py
+++ b/pisi/db/groupdb.py
@@ -32,10 +32,10 @@ class GroupDB(lazydb.LazyDB):
         group_nodes = {}
         group_components = {}
 
-        self.repodb = pisi.db.repodb.RepoDB()
+        repodb = pisi.db.repodb.RepoDB()
 
-        for repo in self.repodb.list_repos():
-            doc = self.repodb.get_repo_doc(repo)
+        for repo in repodb.list_repos():
+            doc = repodb.get_repo_doc(repo)
             group_nodes[repo] = self.__generate_groups(doc)
             group_components[repo] = self.__generate_components(doc)
 
diff --git a/pisi/db/itembyrepo.py b/pisi/db/itembyrepo.py
index e0b1f804..d66d9d4d 100644
--- a/pisi/db/itembyrepo.py
+++ b/pisi/db/itembyrepo.py
@@ -21,7 +21,6 @@ class ItemByRepo:
     def __init__(self, dbobj, compressed=False):
         self.dbobj = dbobj
         self.compressed = compressed
-        self.repodb = pisi.db.repodb.RepoDB()
 
     def has_repo(self, repo):
         return self.dbobj.has_key(repo)
@@ -34,7 +33,7 @@ class ItemByRepo:
         return False
 
     def which_repo(self, item):
-        for r in self.repodb.list_repos():
+        for r in pisi.db.repodb.RepoDB().list_repos():
             if self.dbobj.has_key(r) and self.dbobj[r].has_key(item):
                 return r
 
@@ -89,7 +88,7 @@ class ItemByRepo:
                     yield item, self.dbobj[r][item]
         
     def item_repos(self, repo=None):
-        repos = self.repodb.list_repos()
+        repos = pisi.db.repodb.RepoDB().list_repos()
         if repo:
             repos = [repo]
         return repos