diff --git a/BUILD.gn b/BUILD.gn
index a7d62a5..d51ecb4 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -222,21 +222,6 @@
 # use the build flags to control what is included, instead of trying to specify
 # the subsets that they want.
 
-source_set("tint_core_demangler") {
-  sources = [
-    "src/demangler.cc",
-    "src/demangler.h",
-  ]
-
-  configs += [ ":tint_common_config" ]
-  public_configs = [ ":tint_public_config" ]
-
-  if (build_with_chromium) {
-    configs -= [ "//build/config/compiler:chromium_code" ]
-    configs += [ "//build/config/compiler:no_chromium_code" ]
-  }
-}
-
 source_set("libtint_core_src") {
   sources = [
     "src/ast/access_control.cc",
@@ -412,6 +397,8 @@
     "src/ast/workgroup_decoration.h",
     "src/castable.cc",
     "src/castable.h",
+    "src/demangler.cc",
+    "src/demangler.h",
     "src/diagnostic/diagnostic.cc",
     "src/diagnostic/diagnostic.h",
     "src/diagnostic/formatter.cc",
@@ -475,8 +462,6 @@
     sources += [ "src/diagnostic/printer_other.cc" ]
   }
 
-  deps = [ ":tint_core_demangler" ]
-
   public_deps = [
     ":tint_core_enums_unified1",
     ":tint_core_tables_unified1",
@@ -1440,10 +1425,7 @@
   if (tint_build_wgsl_reader && tint_build_wgsl_writer) {
     fuzzer_test("tint_ast_clone_fuzzer") {
       sources = [ "fuzzers/tint_ast_clone_fuzzer.cc" ]
-      deps = [
-        ":tint_fuzzer_common",
-        ":tint_core_demangler",
-      ]
+      deps = [ ":tint_fuzzer_common" ]
     }
   }
 }