diff --git a/DEPS b/DEPS
index f7a0c410aa..d5c29bd0e0 100644
--- a/DEPS
+++ b/DEPS
@@ -71,11 +71,9 @@ vars = {
   'dart_protobuf_rev': 'b7dd58cdbd879beee4c3fbf8ee80fce8e97bad26',
   'dart_pub_rev': '58de642dc1d07601f6eb2b4ecd94555c0210106b',
   'dart_tools_rev': 'b412ba4550bb634caf3c1064b7ebb671cd5e9247',
-  'dart_watcher_rev': '7f3b3a3ea49ba7e21fff240ce8ee616d62d32956',
   'dart_web_rev': 'af5de5e8548060c0795713ee7129ba6d5ff9f1b2',
   'dart_webdev_rev': 'e72f365a4408dce73bc023e624adc6a9a72dd7a2',
   'dart_webkit_inspection_protocol_rev': 'effa75205516757795683d527c3dea9546eb0c32',
-  'dart_yaml_edit_rev': 'fbdc70acc164af187772e013a2e1364cd05b88dc',
 
   'ocmock_rev': 'c4ec0e3a7a9f56cfdbd0aa01f4f97bb4b75c5ef8', # v3.7.1
 
@@ -196,23 +194,16 @@ vars = {
   "upstream_shelf": "https://github.com/dart-lang/shelf.git",
   "upstream_skia": "https://skia.googlesource.com/skia.git",
   "upstream_sqlite": "https://github.com/sqlite/sqlite.git",
-  "upstream_stack_trace": "https://github.com/dart-lang/stack_trace.git",
-  "upstream_stream_channel": "https://github.com/dart-lang/stream_channel.git",
-  "upstream_string_scanner": "https://github.com/dart-lang/string_scanner.git",
   "upstream_SwiftShader": "https://swiftshader.googlesource.com/SwiftShader.git",
   "upstream_tar": "https://github.com/simolus3/tar.git",
-  "upstream_term_glyph": "https://github.com/dart-lang/term_glyph.git",
   "upstream_test": "https://github.com/dart-lang/test.git",
   "upstream_usage": "https://github.com/dart-lang/usage.git",
   "upstream_vector_math": "https://github.com/google/vector_math.dart.git",
   "upstream_VulkanMemoryAllocator": "https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git",
-  "upstream_watcher": "https://github.com/dart-lang/watcher.git",
   "upstream_web_socket_channel": "https://github.com/dart-lang/web_socket_channel.git",
   "upstream_webdev": "https://github.com/dart-lang/webdev.git",
   "upstream_webkit_inspection_protocol": "https://github.com/google/webkit_inspection_protocol.dart.git",
   "upstream_wuffs-mirror-release-c": "https://github.com/google/wuffs-mirror-release-c.git",
-  "upstream_yaml_edit": "https://github.com/dart-lang/yaml_edit.git",
-  "upstream_yaml": "https://github.com/dart-lang/yaml.git",
   "upstream_yapf": "https://github.com/google/yapf.git",
   "upstream_zlib": "https://github.com/madler/zlib.git",
 
@@ -351,30 +342,15 @@ deps = {
   'engine/src/flutter/third_party/dart/third_party/pkg/shelf':
    Var('dart_git') + '/shelf.git@2b5b683e78f5cc84e479a43297fd7b5489d7db02',
 
-  'engine/src/flutter/third_party/dart/third_party/pkg/stack_trace':
-   Var('dart_git') + '/stack_trace.git@5fe4cfea7f0d8e67b7d5738d2e1c64a18b5ba450',
-
-  'engine/src/flutter/third_party/dart/third_party/pkg/stream_channel':
-   Var('dart_git') + '/stream_channel.git@31a3aba8a78a78b266fbf7474f19cd4ba9ca562e',
-
-  'engine/src/flutter/third_party/dart/third_party/pkg/string_scanner':
-   Var('dart_git') + '/string_scanner.git@69212690d491603a511904a7a84cd502f34bf7a9',
-
   'engine/src/flutter/third_party/dart/third_party/pkg/tar':
    Var('dart_git') + '/external/github.com/simolus3/tar.git@5a1ea943e70cdf3fa5e1102cdbb9418bd9b4b81a',
 
-  'engine/src/flutter/third_party/dart/third_party/pkg/term_glyph':
-   Var('dart_git') + '/term_glyph.git@52677db71a2c6b6d0018ebbe5ed7552dbae1248f',
-
   'engine/src/flutter/third_party/dart/third_party/pkg/test':
    Var('dart_git') + '/test.git@f364fc8291d668d85c702a5b9f9a4f2e5c1ade0e',
 
   'engine/src/flutter/third_party/dart/third_party/pkg/tools':
    Var('dart_git') + '/tools.git' + '@' + Var('dart_tools_rev'),
 
-  'engine/src/flutter/third_party/dart/third_party/pkg/watcher':
-   Var('dart_git') + '/watcher.git' + '@' + Var('dart_watcher_rev'),
-
   'engine/src/flutter/third_party/dart/third_party/pkg/web':
    Var('dart_git') + '/web.git' + '@' + Var('dart_web_rev'),
 
@@ -387,12 +363,6 @@ deps = {
   'engine/src/flutter/third_party/dart/third_party/pkg/webkit_inspection_protocol':
    Var('dart_git') + '/external/github.com/google/webkit_inspection_protocol.dart.git' + '@' + Var('dart_webkit_inspection_protocol_rev'),
 
-  'engine/src/flutter/third_party/dart/third_party/pkg/yaml':
-   Var('dart_git') + '/yaml.git@0406507fb719b0c8787896475734747fa35f2b78',
-
-  'engine/src/flutter/third_party/dart/third_party/pkg/yaml_edit':
-   Var('dart_git') + '/yaml_edit.git' + '@' + Var('dart_yaml_edit_rev'),
-
   'engine/src/flutter/third_party/dart/tools/sdks/dart-sdk':
    {'dep_type': 'cipd', 'packages': [{'package': 'dart/dart-sdk/${{platform}}', 'version': 'git_revision:f863f0b43625eb04539a34d7cc25029ba80dd522'}]},
 
diff --git a/engine/src/flutter/pubspec.yaml b/engine/src/flutter/pubspec.yaml
index 0a64eee9f8..d64b16a5bf 100644
--- a/engine/src/flutter/pubspec.yaml
+++ b/engine/src/flutter/pubspec.yaml
@@ -270,13 +270,13 @@ dependency_overrides:
   source_span:
     path: ./third_party/dart/third_party/pkg/tools/pkgs/source_span
   stack_trace:
-    path: ./third_party/dart/third_party/pkg/stack_trace
+    path: ./third_party/dart/third_party/pkg/tools/pkgs/stack_trace
   stream_channel:
-    path: ./third_party/dart/third_party/pkg/stream_channel
+    path: ./third_party/dart/third_party/pkg/tools/pkgs/stream_channel
   string_scanner:
-    path: ./third_party/dart/third_party/pkg/string_scanner
+    path: ./third_party/dart/third_party/pkg/tools/pkgs/string_scanner
   term_glyph:
-    path: ./third_party/dart/third_party/pkg/term_glyph
+    path: ./third_party/dart/third_party/pkg/tools/pkgs/term_glyph
   test:
     path: ./third_party/dart/third_party/pkg/test/pkgs/test
   test_api:
@@ -292,7 +292,7 @@ dependency_overrides:
   vm_service_protos:
     path: ./third_party/dart/pkg/vm_service_protos
   watcher:
-    path: ./third_party/dart/third_party/pkg/watcher
+    path: ./third_party/dart/third_party/pkg/tools/pkgs/watcher
   web:
     path: ./third_party/dart/third_party/pkg/web/web
   web_socket:
@@ -302,4 +302,4 @@ dependency_overrides:
   webkit_inspection_protocol:
     path: ./third_party/dart/third_party/pkg/webkit_inspection_protocol
   yaml:
-    path: ./third_party/dart/third_party/pkg/yaml
+    path: ./third_party/dart/third_party/pkg/tools/pkgs/yaml
diff --git a/engine/src/flutter/web_sdk/pubspec.yaml b/engine/src/flutter/web_sdk/pubspec.yaml
index cae3323f31..8b067e59e7 100644
--- a/engine/src/flutter/web_sdk/pubspec.yaml
+++ b/engine/src/flutter/web_sdk/pubspec.yaml
@@ -51,12 +51,12 @@ dependency_overrides: # Must include all transitive dependencies from the "any"
   source_span:
     path: ../third_party/dart/third_party/pkg/tools/pkgs/source_span
   string_scanner:
-    path: ../third_party/dart/third_party/pkg/string_scanner
+    path: ../third_party/dart/third_party/pkg/tools/pkgs/string_scanner
   term_glyph:
-    path: ../third_party/dart/third_party/pkg/term_glyph
+    path: ../third_party/dart/third_party/pkg/tools/pkgs/term_glyph
   typed_data:
     path: ../third_party/dart/third_party/pkg/core/pkgs/typed_data
   watcher:
-    path: ../third_party/dart/third_party/pkg/watcher
+    path: ../third_party/dart/third_party/pkg/tools/pkgs/watcher
   yaml:
-    path: ../third_party/dart/third_party/pkg/yaml
+    path: ../third_party/dart/third_party/pkg/tools/pkgs/yaml