diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8c6b95e..9c053d6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,6 @@
 ## 1.0.0 (unreleased)
 
 - Added Docker image for `linux/arm64`
-- Improved `--defer-constraints`
 - Fixed warning with Ruby 3.3
 - Dropped support for Ruby < 2.7
 
diff --git a/lib/pgsync/table_sync.rb b/lib/pgsync/table_sync.rb
index b88f823..c7a8ec9 100644
--- a/lib/pgsync/table_sync.rb
+++ b/lib/pgsync/table_sync.rb
@@ -126,7 +126,7 @@ def show_notes
 
       # for non-deferrable constraints
       if opts[:defer_constraints_v1]
-        constraints = non_deferrable_constraints(destination, tasks.map(&:table))
+        constraints = non_deferrable_constraints(destination)
         constraints = tasks.flat_map { |t| constraints[t.table] || [] }
         warning "Non-deferrable constraints: #{constraints.join(", ")}" if constraints.any?
       end
@@ -150,35 +150,11 @@ def columns(data_source)
       end.to_h
     end
 
-    def non_deferrable_constraints(data_source, tables)
+    def non_deferrable_constraints(data_source)
       query = <<~SQL
         SELECT
           table_schema AS schema,
           table_name AS table,
-          constraint_schema,
-          constraint_name
-        FROM
-          information_schema.key_column_usage
-        UNION ALL
-        SELECT
-          table_schema AS schema,
-          table_name AS table,
-          constraint_schema,
-          constraint_name
-        FROM
-          information_schema.constraint_column_usage
-      SQL
-      constraints_by_table =
-        data_source.execute(query)
-          .group_by { |r| Table.new(r["schema"], r["table"]) }
-          .to_h { |k, v| [k, v.map { |r| [r["constraint_schema"], r["constraint_name"]] }] }
-      matching_constraints = Set.new(tables.flat_map { |t| constraints_by_table[t] || [] })
-
-      query = <<~SQL
-        SELECT
-          table_schema AS schema,
-          table_name AS table,
-          constraint_schema,
           constraint_name
         FROM
           information_schema.table_constraints
@@ -186,10 +162,9 @@ def non_deferrable_constraints(data_source, tables)
           constraint_type = 'FOREIGN KEY' AND
           is_deferrable = 'NO'
       SQL
-      data_source.execute(query)
-        .select { |r| matching_constraints.include?([r["constraint_schema"], r["constraint_name"]]) }
-        .group_by { |r| Table.new(r["schema"], r["table"]) }
-        .to_h { |k, v| [k, v.map { |r| r["constraint_name"] }] }
+      data_source.execute(query).group_by { |r| Table.new(r["schema"], r["table"]) }.map do |k, v|
+        [k, v.map { |r| r["constraint_name"] }]
+      end.to_h
     end
 
     def run_tasks(tasks, &block)
@@ -266,7 +241,7 @@ def run_tasks(tasks, &block)
         options[:in_processes] = jobs if jobs
       end
 
-      maybe_defer_constraints(tasks.map(&:table)) do
+      maybe_defer_constraints do
         # could try to use `raise Parallel::Kill` to fail faster with --fail-fast
         # see `fast_faster` branch
         # however, need to make sure connections are cleaned up properly
@@ -286,7 +261,7 @@ def run_tasks(tasks, &block)
     end
 
     # TODO add option to open transaction on source when manually specifying order of tables
-    def maybe_defer_constraints(tables)
+    def maybe_defer_constraints
       if opts[:disable_integrity] || opts[:disable_integrity_v2]
         # create a transaction on the source
         # to ensure we get a consistent snapshot
@@ -296,7 +271,7 @@ def maybe_defer_constraints(tables)
       elsif opts[:defer_constraints_v1] || opts[:defer_constraints_v2]
         destination.transaction do
           if opts[:defer_constraints_v2]
-            table_constraints = non_deferrable_constraints(destination, tables)
+            table_constraints = non_deferrable_constraints(destination)
             table_constraints.each do |table, constraints|
               constraints.each do |constraint|
                 destination.execute("ALTER TABLE #{quote_ident_full(table)} ALTER CONSTRAINT #{quote_ident(constraint)} DEFERRABLE")
diff --git a/test/sync_test.rb b/test/sync_test.rb
index 266f237..0dc1623 100644
--- a/test/sync_test.rb
+++ b/test/sync_test.rb
@@ -136,8 +136,6 @@ def test_defer_constraints
     assert_works "comments,posts --defer-constraints --preserve", config: true
     assert_equal [{"id" => 1}], conn2.exec("SELECT id FROM posts ORDER BY id").to_a
     assert_equal [{"post_id" => 1}], conn2.exec("SELECT post_id FROM comments ORDER BY post_id").to_a
-    assert_prints "ALTER CONSTRAINT", "comments,posts --defer-constraints --debug", config: true
-    refute_prints "ALTER CONSTRAINT", "authors --defer-constraints --debug", config: true
   end
 
   def test_defer_constraints_not_deferrable
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 4d479fe..b26fb52 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -65,11 +65,6 @@ def assert_prints(message, command, **options)
     assert_match message, output
   end
 
-  def refute_prints(message, command, **options)
-    output, _ = run_command(command, **options)
-    refute_match message, output
-  end
-
   def truncate(conn, table)
     conn.exec("TRUNCATE #{quote_ident(table)} CASCADE")
   end