diff --git a/.dart_tool/package_config.json b/.dart_tool/package_config.json
index 3ecc4f840ca..a5e1bb045bb 100644
--- a/.dart_tool/package_config.json
+++ b/.dart_tool/package_config.json
@@ -11,7 +11,7 @@
     "constraint, update this by running tools/generate_package_config.dart."
   ],
   "configVersion": 2,
-  "generated": "2022-02-16T17:23:35.575981",
+  "generated": "2022-02-17T08:48:00.006717",
   "generator": "tools/generate_package_config.dart",
   "packages": [
     {
@@ -276,12 +276,6 @@
       "packageUri": "lib/",
       "languageVersion": "2.15"
     },
-    {
-      "name": "devtools_server",
-      "rootUri": "../third_party/devtools/devtools_server",
-      "packageUri": "lib/",
-      "languageVersion": "2.12"
-    },
     {
       "name": "devtools_shared",
       "rootUri": "../third_party/devtools/devtools_shared",
diff --git a/.packages b/.packages
index 38ab4a9bd64..76b01654b78 100644
--- a/.packages
+++ b/.packages
@@ -41,7 +41,6 @@ dartdoc:third_party/pkg/dartdoc/lib
 dds:pkg/dds/lib
 dds_service_extensions:pkg/dds_service_extensions/lib
 dev_compiler:pkg/dev_compiler/lib
-devtools_server:third_party/devtools/devtools_server/lib
 devtools_shared:third_party/devtools/devtools_shared/lib
 diagnostic:pkg/diagnostic/lib
 expect:pkg/expect/lib
diff --git a/DEPS b/DEPS
index 13950588d98..3e2647271c3 100644
--- a/DEPS
+++ b/DEPS
@@ -110,7 +110,7 @@ vars = {
   "dart_style_rev": "6f894c0ca33686122be9085f06e5b9bf6ad55262",
 
   "dartdoc_rev" : "b3927dd89d6ff9c78dc88ab2901e63b6a3bf29b7",
-  "devtools_rev" : "3b054edf3a14a4a51bc8019f456efcf0073cd626",
+  "devtools_rev" : "2970d4eab8b8e023ac0779090ed17ae391418b9b",
   "ffi_rev": "4dd32429880a57b64edaf54c9d5af8a9fa9a4ffb",
   "fixnum_rev": "848341f061359ef7ddc0cad472c2ecbb036b28ac",
   "file_rev": "1ebc38852ffed24b564910317982298b56c2cedd",
diff --git a/third_party/devtools/update.sh b/third_party/devtools/update.sh
index 92d6f2d99d2..6723520c923 100755
--- a/third_party/devtools/update.sh
+++ b/third_party/devtools/update.sh
@@ -30,9 +30,8 @@ git checkout -b cipd_release $1
 # Copy the build output as well as the devtools packages needed
 # to serve from DDS.
 mkdir cipd_package
-cp -R packages/devtools/build/ cipd_package/web
+cp -R packages/devtools_app/build/web cipd_package/web
 cp -r packages/devtools_shared cipd_package
-cp -r packages/devtools_server cipd_package
 
 cipd create \
   -name dart/third_party/flutter/devtools \
diff --git a/tools/generate_package_config.dart b/tools/generate_package_config.dart
index d6c7b5613da..4d8b3cecda0 100644
--- a/tools/generate_package_config.dart
+++ b/tools/generate_package_config.dart
@@ -58,7 +58,6 @@ void main(List<String> args) {
         'runtime/observatory_2/tests/service_2/observatory_test_package_2'),
     packageDirectory('pkg/vm_service/test/test_package'),
     packageDirectory('sdk/lib/_internal/sdk_library_metadata'),
-    packageDirectory('third_party/devtools/devtools_server'),
     packageDirectory('third_party/devtools/devtools_shared'),
     packageDirectory('third_party/pkg/protobuf/protobuf'),
     packageDirectory('third_party/pkg/webdev/frontend_server_client'),