diff --git a/BUILD.gn b/BUILD.gn
index 3a134d872e..c4152d6c4f 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -12,8 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import("//build_overrides/build.gni")
-import("scripts/dawn_features.gni")
 import("scripts/dawn_overrides_with_defaults.gni")
 
 group("all") {
@@ -26,32 +24,3 @@ group("all") {
     deps += [ "examples:dawn_samples" ]
   }
 }
-
-###############################################################################
-# Temporary groups
-###############################################################################
-
-# Temporary groups to make a 5-way patch to fix crbug.com/913171
-group("dawn_unittests_temp_group") {
-  testonly = true
-  public_deps = [
-    "src/tests:dawn_unittests",
-  ]
-}
-
-group("dawn_end2end_tests_temp_group") {
-  testonly = true
-  public_deps = [
-    "src/tests:dawn_end2end_tests",
-  ]
-}
-
-group("dawn_perf_tests_temp_group") {
-  testonly = true
-  public_deps = [
-    "src/tests:dawn_perf_tests",
-  ]
-  data_deps = [
-    "src/tests:dawn_perf_tests",
-  ]
-}
diff --git a/examples/BUILD.gn b/examples/BUILD.gn
index 5c1eba834d..39ef9c521f 100644
--- a/examples/BUILD.gn
+++ b/examples/BUILD.gn
@@ -35,8 +35,8 @@ static_library("dawn_sample_utils") {
   # Export all of these as public deps so that `gn check` allows includes
   public_deps = [
     "${dawn_root}/src/common",
+    "${dawn_root}/src/dawn:dawn_proc",
     "${dawn_root}/src/dawn:dawncpp",
-    "${dawn_root}/src/dawn:libdawn_proc",
     "${dawn_root}/src/dawn_native",
     "${dawn_root}/src/dawn_wire",
     "${dawn_root}/src/utils:dawn_bindings",
diff --git a/src/dawn/BUILD.gn b/src/dawn/BUILD.gn
index b735293823..d095e9aab5 100644
--- a/src/dawn/BUILD.gn
+++ b/src/dawn/BUILD.gn
@@ -110,10 +110,3 @@ dawn_component("dawn_proc") {
   sources = get_target_outputs(":dawn_proc_gen")
   sources += [ "${dawn_root}/src/include/dawn/dawn_proc.h" ]
 }
-
-# Temporary group while we do a 3-way patch with Chromium
-group("libdawn_proc") {
-  public_deps = [
-    ":dawn_proc",
-  ]
-}
diff --git a/src/fuzzers/BUILD.gn b/src/fuzzers/BUILD.gn
index 83c6da48f8..4479cef67a 100644
--- a/src/fuzzers/BUILD.gn
+++ b/src/fuzzers/BUILD.gn
@@ -86,8 +86,8 @@ static_library("dawn_wire_server_fuzzer_common") {
   ]
   public_deps = [
     "${dawn_root}/src/common",
+    "${dawn_root}/src/dawn:dawn_proc",
     "${dawn_root}/src/dawn:dawncpp",
-    "${dawn_root}/src/dawn:libdawn_proc",
     "${dawn_root}/src/dawn_native:dawn_native_static",
     "${dawn_root}/src/dawn_wire:dawn_wire_static",
   ]
diff --git a/src/tests/BUILD.gn b/src/tests/BUILD.gn
index 2ab99403bf..577db233be 100644
--- a/src/tests/BUILD.gn
+++ b/src/tests/BUILD.gn
@@ -112,8 +112,8 @@ test("dawn_unittests") {
     ":gmock_and_gtest",
     ":mock_webgpu_gen",
     "${dawn_root}/src/common",
+    "${dawn_root}/src/dawn:dawn_proc",
     "${dawn_root}/src/dawn:dawncpp",
-    "${dawn_root}/src/dawn:libdawn_proc",
     "${dawn_root}/src/dawn_native",
     "${dawn_root}/src/dawn_native:dawn_native_sources",
     "${dawn_root}/src/dawn_wire",
@@ -216,8 +216,8 @@ source_set("dawn_end2end_tests_sources") {
   deps = [
     ":gmock_and_gtest",
     "${dawn_root}/src/common",
+    "${dawn_root}/src/dawn:dawn_proc",
     "${dawn_root}/src/dawn:dawncpp",
-    "${dawn_root}/src/dawn:libdawn_proc",
     "${dawn_root}/src/dawn_native",
     "${dawn_root}/src/dawn_wire",
     "${dawn_root}/src/utils:dawn_utils",
@@ -311,8 +311,8 @@ source_set("dawn_white_box_tests_sources") {
   deps = [
     ":gmock_and_gtest",
     "${dawn_root}/src/common",
+    "${dawn_root}/src/dawn:dawn_proc",
     "${dawn_root}/src/dawn:dawncpp",
-    "${dawn_root}/src/dawn:libdawn_proc",
     "${dawn_root}/src/dawn_native:dawn_native_sources",
     "${dawn_root}/src/dawn_wire",
     "${dawn_root}/src/utils:dawn_utils",
@@ -368,8 +368,8 @@ test("dawn_end2end_tests_tmp") {
     ":dawn_white_box_tests_sources",
     ":gmock_and_gtest",
     "${dawn_root}/src/common",
+    "${dawn_root}/src/dawn:dawn_proc",
     "${dawn_root}/src/dawn:dawncpp",
-    "${dawn_root}/src/dawn:libdawn_proc",
     "${dawn_root}/src/dawn_native",
     "${dawn_root}/src/dawn_wire",
     "${dawn_root}/src/utils:dawn_utils",
@@ -407,8 +407,8 @@ test("dawn_end2end_tests") {
     ":dawn_white_box_tests_sources",
     ":gmock_and_gtest",
     "${dawn_root}/src/common",
+    "${dawn_root}/src/dawn:dawn_proc",
     "${dawn_root}/src/dawn:dawncpp",
-    "${dawn_root}/src/dawn:libdawn_proc",
     "${dawn_root}/src/dawn_native",
     "${dawn_root}/src/dawn_wire",
     "${dawn_root}/src/utils:dawn_utils",
@@ -448,8 +448,8 @@ test("dawn_perf_tests") {
   deps = [
     ":gmock_and_gtest",
     "${dawn_root}/src/common",
+    "${dawn_root}/src/dawn:dawn_proc",
     "${dawn_root}/src/dawn:dawncpp",
-    "${dawn_root}/src/dawn:libdawn_proc",
     "${dawn_root}/src/dawn_native",
     "${dawn_root}/src/dawn_platform",
     "${dawn_root}/src/dawn_wire",