diff --git a/pkg/compiler/lib/src/library_loader.dart b/pkg/compiler/lib/src/library_loader.dart
index b4832ee..e4295e8 100644
--- a/pkg/compiler/lib/src/library_loader.dart
+++ b/pkg/compiler/lib/src/library_loader.dart
@@ -56,7 +56,7 @@
       } else {
         String targetName =
             _options.compileForServer ? "dart2js_server" : "dart2js";
-        String platform = '${targetName}_platform_strong.dill';
+        String platform = '${targetName}_platform.dill';
         initializedCompilerState = fe.initializeCompiler(
             initializedCompilerState,
             new Dart2jsTarget(targetName, new TargetFlags(strongMode: true)),
diff --git a/sdk/BUILD.gn b/sdk/BUILD.gn
index 857219e..5bd19c1 100644
--- a/sdk/BUILD.gn
+++ b/sdk/BUILD.gn
@@ -516,14 +516,10 @@
     ":copy_libraries",
     "../utils/compiler:compile_dart2js_platform",
     "../utils/compiler:compile_dart2js_server_platform",
-    "../utils/compiler:compile_dart2js_platform_strong",
-    "../utils/compiler:compile_dart2js_server_platform_strong",
   ]
   sources = [
     "$root_out_dir/dart2js_platform.dill",
     "$root_out_dir/dart2js_server_platform.dill",
-    "$root_out_dir/dart2js_platform_strong.dill",
-    "$root_out_dir/dart2js_server_platform_strong.dill",
   ]
   outputs = [
     "$root_out_dir/dart-sdk/lib/_internal/{{source_file_part}}",
diff --git a/utils/compiler/BUILD.gn b/utils/compiler/BUILD.gn
index f6024c4..3dbee83 100644
--- a/utils/compiler/BUILD.gn
+++ b/utils/compiler/BUILD.gn
@@ -60,14 +60,11 @@
 application_snapshot("dart2js") {
   deps = [
     ":compile_dart2js_platform",
-    ":compile_dart2js_platform_strong",
     ":dart2js_create_snapshot_entry",
   ]
   inputs = [
     "$root_out_dir/dart2js_platform.dill",
     "$root_out_dir/dart2js_outline.dill",
-    "$root_out_dir/dart2js_platform_strong.dill",
-    "$root_out_dir/dart2js_outline_strong.dill",
   ]
   vm_args = []
   main_dart = "$target_gen_dir/dart2js.dart"
@@ -91,27 +88,10 @@
 
   args = [
     "--target=dart2js",
-    "dart:core",
-  ]
-}
-
-compile_platform("compile_dart2js_platform_strong") {
-  single_root_scheme = "org-dartlang-sdk"
-  single_root_base = rebase_path("../../")
-  libraries_specification_uri = "org-dartlang-sdk:///sdk/lib/libraries.json"
-
-  outputs = [
-    "$root_out_dir/dart2js_platform_strong.dill",
-    "$root_out_dir/dart2js_outline_strong.dill",
-  ]
-
-  args = [
-    "--target=dart2js",
     "--strong",
     "dart:core",
   ]
 }
-
 compile_platform("compile_dart2js_server_platform") {
   single_root_scheme = "org-dartlang-sdk"
   single_root_base = rebase_path("../../")
@@ -124,22 +104,6 @@
 
   args = [
     "--target=dart2js_server",
-    "dart:core",
-  ]
-}
-
-compile_platform("compile_dart2js_server_platform_strong") {
-  single_root_scheme = "org-dartlang-sdk"
-  single_root_base = rebase_path("../../")
-  libraries_specification_uri = "org-dartlang-sdk:///sdk/lib/libraries.json"
-
-  outputs = [
-    "$root_out_dir/dart2js_server_platform_strong.dill",
-    "$root_out_dir/dart2js_server_outline_strong.dill",
-  ]
-
-  args = [
-    "--target=dart2js_server",
     "--strong",
     "dart:core",
   ]
diff --git a/utils/dartdevc/BUILD.gn b/utils/dartdevc/BUILD.gn
index 6fecc50..03be2cc 100644
--- a/utils/dartdevc/BUILD.gn
+++ b/utils/dartdevc/BUILD.gn
@@ -83,7 +83,6 @@
   dart_action(target_name) {
     deps = [
       "../compiler:compile_dart2js_platform",
-      "../compiler:compile_dart2js_platform_strong",
     ]
 
     # dart_action() needs kernel service snapshot to run in Dart 2 mode.
@@ -94,8 +93,6 @@
     inputs = sdk_lib_files + compiler_files + dev_compiler_files + [
                "$root_out_dir/dart2js_platform.dill",
                "$root_out_dir/dart2js_outline.dill",
-               "$root_out_dir/dart2js_platform_strong.dill",
-               "$root_out_dir/dart2js_outline_strong.dill",
              ]
     outputs = [
       out,
