Index: /main/waeup.kofa/trunk/src/waeup/kofa/meta.py
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/meta.py	(revision 15768)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/meta.py	(revision 15769)
@@ -35,4 +35,5 @@
 """
 import grok
+import grokcore.component
 import martian
 from grok import components
@@ -40,4 +41,5 @@
 from martian.error import GrokError
 from zope import component
+from zope.processlifetime import IDatabaseOpened
 from waeup.kofa.interfaces import IObjectUpgradeEvent
 
@@ -106,2 +108,17 @@
                 pass
         #site.logger.info('Catalog `%s` ready.' % self.catalog_name)
+
+
+
+@grokcore.component.subscribe(IDatabaseOpened)
+def disable_broken_handlers(event):
+    """This one is fired after ZODB setup.
+
+    Unregsiter handlers etc., that are broken or meant trouble in the past.
+    """
+    from zope.component import getGlobalSiteManager
+    from zope.catalog.catalog import indexAdded
+    worked = getGlobalSiteManager().unregisterHandler(indexAdded)
+    if worked:
+        print("Unregistered handler zope.catalog.catalog.indexAdded")
+    # TODO: register a replacement that copes better with large indexes.
