diff --git a/src/metabase/driver/generic_sql.clj b/src/metabase/driver/generic_sql.clj
index cb7e81d795382030e5e2f1df07fc56c3b0c8c11d..cdeaa33c4787e48aed34399650ff1c6ce54ede3c 100644
--- a/src/metabase/driver/generic_sql.clj
+++ b/src/metabase/driver/generic_sql.clj
@@ -1,6 +1,7 @@
 (ns metabase.driver.generic-sql
   (:require [clojure.core.memoize :as memoize]
             [clojure.java.jdbc :as jdbc]
+            [clojure.set :as set]
             [clojure.tools.logging :as log]
             (korma [core :as k]
                    [db :as kdb])
@@ -125,12 +126,12 @@
      (let [~binding (.getMetaData conn#)]
        ~@body)))
 
-(defn- active-tables
-  "Fast implementation of `IDriver/active-tables`.
-   Fetches list of schemas, then for each one not in `excluded-schemas`, fetch their Tables.
 
-   The old implementation fetched *all* Tables, then filtered out ones with `excluded-schemas` in Clojure;
-   this is as much as 15x faster for Databases with a lot of system tables like Oracle (4 seconds vs 60)."
+(defn fast-active-tables
+  "Default, fast implementation of `IDriver/active-tables` best suited for DBs with lots of system tables (like Oracle).
+   Fetch list of schemas, then for each one not in `excluded-schemas`, fetch its Tables, and combine the results.
+
+   This is as much as 15x faster for Databases with lots of system tables than `post-filtered-active-tables` (4 seconds vs 60)."
   [driver database]
   (with-metadata [md driver database]
     (let [all-schemas (set (map :table_schem (jdbc/result-set-seq (.getSchemas md))))
@@ -140,6 +141,17 @@
              {:name   table-name
               :schema schema})))))
 
+(defn post-filtered-active-tables
+  "Alternative implementation of `IDriver/active-tables` best suited for DBs with little or no support for schemas.
+   Fetch *all* Tables, then filter out ones whose schema is in `excluded-schemas` Clojure-side."
+  [driver database]
+  (with-metadata [md driver database]
+    (set (for [table (filter #(not (contains? (excluded-schemas driver) (:table_schem %)))
+                             (jdbc/result-set-seq (.getTables md nil nil nil (into-array String ["TABLE", "VIEW"]))))]
+           {:name   (:table_name table)
+            :schema (:table_schem table)}))))
+
+
 (defn- active-column-names->type [driver table]
   (with-metadata [md driver @(:db table)]
     (into {} (for [{:keys [column_name type_name]} (jdbc/result-set-seq (.getColumns md nil (:schema table) (:name table) nil))]
@@ -253,7 +265,7 @@
            'metabase.driver.generic-sql.query-processor)
   (merge driver/IDriverDefaultsMixin
          {:active-column-names->type active-column-names->type
-          :active-tables             active-tables
+          :active-tables             fast-active-tables
           :can-connect?              can-connect?
           :features                  features
           :field-avg-length          field-avg-length
diff --git a/src/metabase/driver/h2.clj b/src/metabase/driver/h2.clj
index b0c5ed21fcd8c07f61c83c38cd34b49a5b381207..7cc1bdb384323dff79d6d229ed5acf96e24d8e8d 100644
--- a/src/metabase/driver/h2.clj
+++ b/src/metabase/driver/h2.clj
@@ -198,7 +198,8 @@
 (extend H2Driver
   driver/IDriver
   (merge (sql/IDriverSQLDefaultsMixin)
-         {:date-interval                     date-interval
+         {:active-tables                     sql/post-filtered-active-tables
+          :date-interval                     date-interval
           :details-fields                    (constantly [{:name         "db"
                                                            :display-name "Connection String"
                                                            :placeholder  "file:/Users/camsaul/bird_sightings/toucans;AUTO_SERVER=TRUE"
diff --git a/src/metabase/driver/mysql.clj b/src/metabase/driver/mysql.clj
index af3ba8f645b6ed95aaa849177bd17cb4a16b4a71..af878beb05d7a2dff5645d79d36985c86d97afb8 100644
--- a/src/metabase/driver/mysql.clj
+++ b/src/metabase/driver/mysql.clj
@@ -141,7 +141,8 @@
 (extend MySQLDriver
   driver/IDriver
   (merge (sql/IDriverSQLDefaultsMixin)
-         {:date-interval                     date-interval
+         {:active-tables                     sql/post-filtered-active-tables
+          :date-interval                     date-interval
           :details-fields                    (constantly [{:name         "host"
                                                            :display-name "Host"
                                                            :default      "localhost"}
diff --git a/src/metabase/driver/sqlite.clj b/src/metabase/driver/sqlite.clj
index 3e51f02d78f02c0df1d563ad13c5f197e443a19c..e4827d56dcc301ac407fb81e11f0e954fa6fee52 100644
--- a/src/metabase/driver/sqlite.clj
+++ b/src/metabase/driver/sqlite.clj
@@ -108,7 +108,8 @@
 (extend SQLiteDriver
   driver/IDriver
   (merge (sql/IDriverSQLDefaultsMixin)
-         {:date-interval  date-interval
+         {:active-tables  sql/post-filtered-active-tables
+          :date-interval  date-interval
           :details-fields (constantly [{:name         "db"
                                         :display-name "Filename"
                                         :placeholder  "/home/camsaul/toucan_sightings.sqlite 😋"
diff --git a/src/metabase/driver/sync.clj b/src/metabase/driver/sync.clj
index 372a4e7513fe8e5e6e2d9980762a615c74426c2f..eb719b97390cbd237da8036b059b5cde0895fc76 100644
--- a/src/metabase/driver/sync.clj
+++ b/src/metabase/driver/sync.clj
@@ -84,12 +84,12 @@
     (validate-active-tables active-tables)
 
     (mark-inactive-tables! database active-tables existing-table->id)
-    (create-new-tables!    database active-tables existing-table->id))
+    (create-new-tables!    database active-tables existing-table->id)
 
-  (fetch-and-sync-database-active-tables! driver database)
+    (fetch-and-sync-database-active-tables! driver database)
 
-  ;; Ok, now if we had a _metabase_metadata table from earlier we can go ahead and sync from it
-  (sync-metabase-metadata-table! driver database active-tables))
+    ;; Ok, now if we had a _metabase_metadata table from earlier we can go ahead and sync from it
+    (sync-metabase-metadata-table! driver database active-tables)))
 
 (defn- -sync-database-with-tracking! [driver database]
   (let [start-time    (System/currentTimeMillis)