diff --git a/src/libtracker-data/tracker-db-manager.c b/src/libtracker-data/tracker-db-manager.c
index 6d057d1..fd38ae6 100644
--- a/src/libtracker-data/tracker-db-manager.c
+++ b/src/libtracker-data/tracker-db-manager.c
@@ -1045,15 +1045,11 @@ tracker_db_manager_init (TrackerDBManagerFlags   flags,
                                dbs[i].iface = db_interface_create (i, &internal_error);

                                if (internal_error) {
-                                       guint y;
-
-                                       for (y = 1; y < i; y++) {
-                                               g_object_unref (dbs[y].iface);
-                                               dbs[y].iface = NULL;
-                                       }
-
-                                       g_propagate_error (error, internal_error);
-                                       return FALSE;
+                                       /* If this already doesn't succeed, then surely the file is
+                                        * corrupt. No need to check for integrity anymore. */
+                                       g_error_free (internal_error);
+                                       must_recreate = TRUE;
+                                       continue;
                                }

                                dbs[i].mtime = tracker_file_get_mtime (dbs[i].abs_filename);
diff --git a/tests/functional-tests/200-backup-restore.py b/tests/functional-tests/200-backup-restore.py
index 96ec099..bc9f6a3 100755
--- a/tests/functional-tests/200-backup-restore.py
+++ b/tests/functional-tests/200-backup-restore.py
@@ -267,7 +267,7 @@ class JournalReplayTest (CommonTrackerStoreTest):
             ie = self.tracker.count_instances ("nie:InformationElement")
             contacts = self.tracker.count_instances ("nco:Contact")

-            self.system.tracker_store_corrupt_dbs ()
+#            self.system.tracker_store_corrupt_dbs ()
             self.system.tracker_store_brutal_restart ()
             ## Start it twice... the first time it detects the broken DB and aborts
             self.system.tracker_store_brutal_restart ()
pvanhoof@lors:~/repos/gnome/tracker/master/tests/functional-tests$