diff --git a/pkg/compiler/lib/src/closure.dart b/pkg/compiler/lib/src/closure.dart
index 2429d365f9e..89edda7c273 100644
--- a/pkg/compiler/lib/src/closure.dart
+++ b/pkg/compiler/lib/src/closure.dart
@@ -5,7 +5,6 @@
 import 'package:kernel/ast.dart' as ir;
 import 'common.dart';
 import 'elements/entities.dart';
-import 'elements/types.dart';
 import 'js_model/closure.dart';
 import 'js_model/element_map.dart';
 import 'serialization/serialization.dart';
@@ -345,12 +344,12 @@ class ThisLocal extends Local {
 
 /// A type variable as a local variable.
 class TypeVariableLocal implements Local {
-  final TypeVariableType typeVariable;
+  final TypeVariableEntity typeVariable;
 
   TypeVariableLocal(this.typeVariable);
 
   @override
-  String get name => typeVariable.element.name;
+  String get name => typeVariable.name;
 
   @override
   int get hashCode => typeVariable.hashCode;
diff --git a/pkg/compiler/lib/src/ir/static_type.dart b/pkg/compiler/lib/src/ir/static_type.dart
index 76c5ab99e39..3301d8f0f9c 100644
--- a/pkg/compiler/lib/src/ir/static_type.dart
+++ b/pkg/compiler/lib/src/ir/static_type.dart
@@ -192,7 +192,8 @@ abstract class StaticTypeVisitor extends StaticTypeBase {
     // subtypes of Object (not just interface types), and function types are
     // considered subtypes of Function.
     if (superclass.typeParameters.isEmpty) {
-      return typeEnvironment.coreTypes.rawType(superclass, type.nullability);
+      return typeEnvironment.coreTypes
+          .rawType(superclass, ir.Nullability.legacy);
     }
     while (type is ir.TypeParameterType) {
       type = (type as ir.TypeParameterType).parameter.bound;
diff --git a/pkg/compiler/lib/src/js_model/locals.dart b/pkg/compiler/lib/src/js_model/locals.dart
index d6666c012c1..e9bcb425961 100644
--- a/pkg/compiler/lib/src/js_model/locals.dart
+++ b/pkg/compiler/lib/src/js_model/locals.dart
@@ -274,7 +274,7 @@ class KernelToLocalsMapImpl implements KernelToLocalsMap {
     // TODO(efortuna, johnniwinther): We're not registering the type variables
     // like we are for the variable declarations. Is that okay or do we need to
     // make TypeVariableLocal a JLocal?
-    return new TypeVariableLocal(elementMap.getTypeVariableType(node));
+    return new TypeVariableLocal(elementMap.getTypeVariableType(node).element);
   }
 
   @override
diff --git a/pkg/compiler/lib/src/serialization/abstract_sink.dart b/pkg/compiler/lib/src/serialization/abstract_sink.dart
index 0f90be4d6e8..19b110ac8d0 100644
--- a/pkg/compiler/lib/src/serialization/abstract_sink.dart
+++ b/pkg/compiler/lib/src/serialization/abstract_sink.dart
@@ -423,7 +423,7 @@ abstract class AbstractDataSink extends DataSinkMixin implements DataSink {
       writeClass(local.closureClass);
     } else if (local is TypeVariableLocal) {
       writeEnum(LocalKind.typeVariableLocal);
-      writeDartType(local.typeVariable);
+      writeTypeVariable(local.typeVariable);
     } else {
       throw new UnsupportedError("Unsupported local ${local.runtimeType}");
     }
diff --git a/pkg/compiler/lib/src/serialization/abstract_source.dart b/pkg/compiler/lib/src/serialization/abstract_source.dart
index 122cfb05f61..c513d152dc7 100644
--- a/pkg/compiler/lib/src/serialization/abstract_source.dart
+++ b/pkg/compiler/lib/src/serialization/abstract_source.dart
@@ -643,7 +643,7 @@ abstract class AbstractDataSource extends DataSourceMixin
         ClassEntity cls = readClass();
         return new AnonymousClosureLocal(cls);
       case LocalKind.typeVariableLocal:
-        TypeVariableType typeVariable = readDartType();
+        TypeVariableEntity typeVariable = readTypeVariable();
         return new TypeVariableLocal(typeVariable);
     }
     throw new UnsupportedError("Unexpected local kind $kind");
diff --git a/pkg/compiler/lib/src/serialization/node_indexer.dart b/pkg/compiler/lib/src/serialization/node_indexer.dart
index 92b90d22d79..e20df93b3f4 100644
--- a/pkg/compiler/lib/src/serialization/node_indexer.dart
+++ b/pkg/compiler/lib/src/serialization/node_indexer.dart
@@ -199,6 +199,12 @@ class _TreeNodeIndexerVisitor extends ir.Visitor<void> {
     registerNode(node);
     super.visitConstantExpression(node);
   }
+
+  @override
+  void visitNullCheck(ir.NullCheck node) {
+    registerNode(node);
+    super.visitNullCheck(node);
+  }
 }
 
 /// Visitor that ascribes an index to all [ir.Constant]s that we potentially
diff --git a/pkg/compiler/lib/src/ssa/locals_handler.dart b/pkg/compiler/lib/src/ssa/locals_handler.dart
index de63ecb616e..3798e19f38d 100644
--- a/pkg/compiler/lib/src/ssa/locals_handler.dart
+++ b/pkg/compiler/lib/src/ssa/locals_handler.dart
@@ -34,8 +34,8 @@ class LocalsHandler {
   Map<Local, FieldEntity> redirectionMapping = new Map<Local, FieldEntity>();
   final KernelSsaGraphBuilder builder;
   ScopeInfo scopeInfo;
-  Map<TypeVariableType, TypeVariableLocal> typeVariableLocals =
-      new Map<TypeVariableType, TypeVariableLocal>();
+  Map<TypeVariableEntity, TypeVariableLocal> typeVariableLocals =
+      new Map<TypeVariableEntity, TypeVariableLocal>();
   final Entity executableContext;
   final MemberEntity memberContext;
 
@@ -408,9 +408,8 @@ class LocalsHandler {
   }
 
   Local getTypeVariableAsLocal(TypeVariableType type) {
-    return typeVariableLocals.putIfAbsent(type, () {
-      return new TypeVariableLocal(type);
-    });
+    return typeVariableLocals[type.element] ??=
+        new TypeVariableLocal(type.element);
   }
 
   /// Sets the [element] to [value]. If the element is boxed or stored in a
diff --git a/sdk_nnbd/lib/_internal/js_runtime/lib/rti.dart b/sdk_nnbd/lib/_internal/js_runtime/lib/rti.dart
index 3c4a5eb0a20..6bb82a90265 100644
--- a/sdk_nnbd/lib/_internal/js_runtime/lib/rti.dart
+++ b/sdk_nnbd/lib/_internal/js_runtime/lib/rti.dart
@@ -302,7 +302,7 @@ class Rti {
   /// different indexing in the recipe.
   Object? _evalCache;
 
-  static Object? _getEvalCache(Rti rti) => rti._evalCache!;
+  static Object? _getEvalCache(Rti rti) => rti._evalCache;
   static void _setEvalCache(Rti rti, value) {
     rti._evalCache = value;
   }
@@ -322,7 +322,7 @@ class Rti {
   /// instantiations.
   Object? _bindCache;
 
-  static Object? _getBindCache(Rti rti) => rti._bindCache!;
+  static Object? _getBindCache(Rti rti) => rti._bindCache;
   static void _setBindCache(Rti rti, value) {
     rti._bindCache = value;
   }
@@ -331,10 +331,10 @@ class Rti {
     return new Rti();
   }
 
-  late Object _canonicalRecipe;
+  Object? _canonicalRecipe;
 
   static String _getCanonicalRecipe(Rti rti) {
-    Object s = rti._canonicalRecipe;
+    Object s = rti._canonicalRecipe!;
     assert(_Utils.isString(s), 'Missing canonical recipe');
     return _Utils.asString(s);
   }
@@ -349,7 +349,7 @@ class _FunctionParameters {
 
   static _FunctionParameters allocate() => _FunctionParameters();
 
-  late Object _requiredPositional;
+  Object? _requiredPositional;
   static JSArray _getRequiredPositional(_FunctionParameters parameters) =>
       JS('JSUnmodifiableArray', '#', parameters._requiredPositional);
   static void _setRequiredPositional(
@@ -357,7 +357,7 @@ class _FunctionParameters {
     parameters._requiredPositional = requiredPositional;
   }
 
-  late Object _optionalPositional;
+  Object? _optionalPositional;
   static JSArray _getOptionalPositional(_FunctionParameters parameters) =>
       JS('JSUnmodifiableArray', '#', parameters._optionalPositional);
   static void _setOptionalPositional(
@@ -374,7 +374,7 @@ class _FunctionParameters {
   /// the name [String]s and the odd indices are the type [Rti]s.
   ///
   /// Invariant: These pairs are sorted by name in lexicographically ascending order.
-  late Object _optionalNamed;
+  Object? _optionalNamed;
   static JSArray _getOptionalNamed(_FunctionParameters parameters) =>
       JS('JSUnmodifiableArray', '#', parameters._optionalNamed);
   static void _setOptionalNamed(
diff --git a/sdk_nnbd/lib/dart2js_migration_libraries.json b/sdk_nnbd/lib/dart2js_migration_libraries.json
deleted file mode 100644
index 219d74a894a..00000000000
--- a/sdk_nnbd/lib/dart2js_migration_libraries.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "comment:0": "NOTE: This file is only used temporarily while migrating ",
-  "comment:1": "dart2js patch files.",
-  "dart2js": {
-    "libraries": {
-      "async": {
-        "uri": "async/async.dart",
-        "patches": "_internal/js_runtime/lib/async_patch.dart"
-      },
-      "collection": {
-        "uri": "collection/collection.dart",
-        "patches": "_internal/js_runtime/lib/collection_patch.dart"
-      },
-      "convert": {
-        "uri": "convert/convert.dart",
-        "patches": "_internal/js_runtime/lib/convert_patch.dart"
-      },
-      "core": {
-        "uri": "core/core.dart",
-        "patches": "_internal/js_runtime/lib/core_patch.dart"
-      },
-      "developer": {
-        "uri": "developer/developer.dart",
-        "patches": "_internal/js_runtime/lib/developer_patch.dart"
-      },
-      "html": {
-        "uri": "html/dart2js/html_dart2js.dart"
-      },
-      "html_common": {
-        "uri": "html/html_common/html_common_dart2js.dart"
-      },
-      "indexed_db": {
-        "uri": "indexed_db/dart2js/indexed_db_dart2js.dart"
-      },
-      "_http": {
-        "uri": "_http/http.dart"
-      },
-      "io": {
-        "uri": "io/io.dart",
-        "patches": "_internal/js_runtime/lib/io_patch.dart",
-        "supported": false
-      },
-      "isolate": {
-        "uri": "isolate/isolate.dart",
-        "patches": "_internal/js_runtime/lib/isolate_patch.dart",
-        "supported": false
-      },
-      "js": {
-        "uri": "js/js.dart",
-        "patches": "_internal/js_runtime/lib/js_patch.dart"
-      },
-      "_js": {
-        "uri": "js/_js.dart",
-        "patches": "js/_js_client.dart"
-      },
-      "js_util": {
-        "uri": "js_util/js_util.dart"
-      },
-      "math": {
-        "uri": "math/math.dart",
-        "patches": "_internal/js_runtime/lib/math_patch.dart"
-      },
-      "typed_data": {
-        "uri": "typed_data/typed_data.dart",
-        "patches": "_internal/js_runtime/lib/typed_data_patch.dart"
-      },
-      "_native_typed_data": {
-        "uri": "_internal/js_runtime/lib/native_typed_data.dart"
-      },
-      "svg": {
-        "uri": "svg/dart2js/svg_dart2js.dart"
-      },
-      "web_audio": {
-        "uri": "web_audio/dart2js/web_audio_dart2js.dart"
-      },
-      "web_gl": {
-        "uri": "web_gl/dart2js/web_gl_dart2js.dart"
-      },
-      "web_sql": {
-        "uri": "web_sql/dart2js/web_sql_dart2js.dart"
-      },
-      "_internal": {
-        "uri": "internal/internal.dart",
-        "patches": "_internal/js_runtime/lib/internal_patch.dart"
-      },
-      "_js_helper": {
-        "uri": "_internal/js_runtime/lib/js_helper.dart"
-      },
-      "_rti": {
-        "uri": "_internal/js_runtime/lib/rti.dart"
-      },
-      "_interceptors": {
-        "uri": "_internal/js_runtime/lib/interceptors.dart"
-      },
-      "_foreign_helper": {
-        "uri": "_internal/js_runtime/lib/foreign_helper.dart"
-      },
-      "_js_names": {
-        "uri": "_internal/js_runtime/lib/js_names.dart"
-      },
-      "_js_primitives": {
-        "uri": "_internal/js_runtime/lib/js_primitives.dart"
-      },
-      "_js_embedded_names": {
-        "uri": "_internal/js_runtime/lib/shared/embedded_names.dart"
-      },
-      "_async_await_error_codes": {
-        "uri": "_internal/js_runtime/lib/shared/async_await_error_codes.dart"
-      },
-      "_recipe_syntax": {
-        "uri": "_internal/js_runtime/lib/shared/recipe_syntax.dart"
-      },
-      "_metadata": {
-        "uri": "html/html_common/metadata.dart"
-      }
-    }
-  }
-}
diff --git a/sdk_nnbd/lib/libraries.json b/sdk_nnbd/lib/libraries.json
index 9cb0006367d..208de69dee5 100644
--- a/sdk_nnbd/lib/libraries.json
+++ b/sdk_nnbd/lib/libraries.json
@@ -161,166 +161,166 @@
   "dart2js": {
     "libraries": {
       "async": {
-        "uri": "../../sdk/lib/async/async.dart",
-        "patches": "../../sdk/lib/_internal/js_runtime/lib/async_patch.dart"
+        "uri": "async/async.dart",
+        "patches": "_internal/js_runtime/lib/async_patch.dart"
       },
       "collection": {
-        "uri": "../../sdk/lib/collection/collection.dart",
-        "patches": "../../sdk/lib/_internal/js_runtime/lib/collection_patch.dart"
+        "uri": "collection/collection.dart",
+        "patches": "_internal/js_runtime/lib/collection_patch.dart"
       },
       "convert": {
-        "uri": "../../sdk/lib/convert/convert.dart",
-        "patches": "../../sdk/lib/_internal/js_runtime/lib/convert_patch.dart"
+        "uri": "convert/convert.dart",
+        "patches": "_internal/js_runtime/lib/convert_patch.dart"
       },
       "core": {
-        "uri": "../../sdk/lib/core/core.dart",
-        "patches": "../../sdk/lib/_internal/js_runtime/lib/core_patch.dart"
+        "uri": "core/core.dart",
+        "patches": "_internal/js_runtime/lib/core_patch.dart"
       },
       "developer": {
-        "uri": "../../sdk/lib/developer/developer.dart",
-        "patches": "../../sdk/lib/_internal/js_runtime/lib/developer_patch.dart"
+        "uri": "developer/developer.dart",
+        "patches": "_internal/js_runtime/lib/developer_patch.dart"
       },
       "html": {
-        "uri": "../../sdk/lib/html/dart2js/html_dart2js.dart"
+        "uri": "html/dart2js/html_dart2js.dart"
       },
       "html_common": {
-        "uri": "../../sdk/lib/html/html_common/html_common_dart2js.dart"
+        "uri": "html/html_common/html_common_dart2js.dart"
       },
       "indexed_db": {
-        "uri": "../../sdk/lib/indexed_db/dart2js/indexed_db_dart2js.dart"
+        "uri": "indexed_db/dart2js/indexed_db_dart2js.dart"
       },
       "_http": {
-        "uri": "../../sdk/lib/_http/http.dart"
+        "uri": "_http/http.dart"
       },
       "io": {
-        "uri": "../../sdk/lib/io/io.dart",
-        "patches": "../../sdk/lib/_internal/js_runtime/lib/io_patch.dart",
+        "uri": "io/io.dart",
+        "patches": "_internal/js_runtime/lib/io_patch.dart",
         "supported": false
       },
       "isolate": {
-        "uri": "../../sdk/lib/isolate/isolate.dart",
-        "patches": "../../sdk/lib/_internal/js_runtime/lib/isolate_patch.dart",
+        "uri": "isolate/isolate.dart",
+        "patches": "_internal/js_runtime/lib/isolate_patch.dart",
         "supported": false
       },
       "js": {
-        "uri": "../../sdk/lib/js/js.dart",
-        "patches": "../../sdk/lib/_internal/js_runtime/lib/js_patch.dart"
+        "uri": "js/js.dart",
+        "patches": "_internal/js_runtime/lib/js_patch.dart"
       },
       "_js": {
-        "uri": "../../sdk/lib/js/_js.dart",
-        "patches": "../../sdk/lib/js/_js_client.dart"
+        "uri": "js/_js.dart",
+        "patches": "js/_js_client.dart"
       },
       "js_util": {
-        "uri": "../../sdk/lib/js_util/js_util.dart"
+        "uri": "js_util/js_util.dart"
       },
       "math": {
-        "uri": "../../sdk/lib/math/math.dart",
-        "patches": "../../sdk/lib/_internal/js_runtime/lib/math_patch.dart"
+        "uri": "math/math.dart",
+        "patches": "_internal/js_runtime/lib/math_patch.dart"
       },
       "typed_data": {
-        "uri": "../../sdk/lib/typed_data/typed_data.dart",
-        "patches": "../../sdk/lib/_internal/js_runtime/lib/typed_data_patch.dart"
+        "uri": "typed_data/typed_data.dart",
+        "patches": "_internal/js_runtime/lib/typed_data_patch.dart"
       },
       "_native_typed_data": {
-        "uri": "../../sdk/lib/_internal/js_runtime/lib/native_typed_data.dart"
+        "uri": "_internal/js_runtime/lib/native_typed_data.dart"
       },
       "svg": {
-        "uri": "../../sdk/lib/svg/dart2js/svg_dart2js.dart"
+        "uri": "svg/dart2js/svg_dart2js.dart"
       },
       "web_audio": {
-        "uri": "../../sdk/lib/web_audio/dart2js/web_audio_dart2js.dart"
+        "uri": "web_audio/dart2js/web_audio_dart2js.dart"
       },
       "web_gl": {
-        "uri": "../../sdk/lib/web_gl/dart2js/web_gl_dart2js.dart"
+        "uri": "web_gl/dart2js/web_gl_dart2js.dart"
       },
       "web_sql": {
-        "uri": "../../sdk/lib/web_sql/dart2js/web_sql_dart2js.dart"
+        "uri": "web_sql/dart2js/web_sql_dart2js.dart"
       },
       "_internal": {
-        "uri": "../../sdk/lib/internal/internal.dart",
-        "patches": "../../sdk/lib/_internal/js_runtime/lib/internal_patch.dart"
+        "uri": "internal/internal.dart",
+        "patches": "_internal/js_runtime/lib/internal_patch.dart"
       },
       "_js_helper": {
-        "uri": "../../sdk/lib/_internal/js_runtime/lib/js_helper.dart"
+        "uri": "_internal/js_runtime/lib/js_helper.dart"
       },
       "_rti": {
-        "uri": "../../sdk/lib/_internal/js_runtime/lib/rti.dart"
+        "uri": "_internal/js_runtime/lib/rti.dart"
       },
       "_interceptors": {
-        "uri": "../../sdk/lib/_internal/js_runtime/lib/interceptors.dart"
+        "uri": "_internal/js_runtime/lib/interceptors.dart"
       },
       "_foreign_helper": {
-        "uri": "../../sdk/lib/_internal/js_runtime/lib/foreign_helper.dart"
+        "uri": "_internal/js_runtime/lib/foreign_helper.dart"
       },
       "_js_names": {
-        "uri": "../../sdk/lib/_internal/js_runtime/lib/js_names.dart"
+        "uri": "_internal/js_runtime/lib/js_names.dart"
       },
       "_js_primitives": {
-        "uri": "../../sdk/lib/_internal/js_runtime/lib/js_primitives.dart"
+        "uri": "_internal/js_runtime/lib/js_primitives.dart"
       },
       "_js_embedded_names": {
-        "uri": "../../sdk/lib/_internal/js_runtime/lib/shared/embedded_names.dart"
+        "uri": "_internal/js_runtime/lib/shared/embedded_names.dart"
       },
       "_async_await_error_codes": {
-        "uri": "../../sdk/lib/_internal/js_runtime/lib/shared/async_await_error_codes.dart"
+        "uri": "_internal/js_runtime/lib/shared/async_await_error_codes.dart"
       },
       "_recipe_syntax": {
-        "uri": "../../sdk/lib/_internal/js_runtime/lib/shared/recipe_syntax.dart"
+        "uri": "_internal/js_runtime/lib/shared/recipe_syntax.dart"
       },
       "_metadata": {
-        "uri": "../../sdk/lib/html/html_common/metadata.dart"
+        "uri": "html/html_common/metadata.dart"
       }
     }
   },
   "dart2js_server": {
     "libraries": {
       "async": {
-        "uri": "../../sdk/lib/async/async.dart",
-        "patches": "../../sdk/lib/_internal/js_runtime/lib/async_patch.dart"
+        "uri": "async/async.dart",
+        "patches": "_internal/js_runtime/lib/async_patch.dart"
       },
       "collection": {
-        "uri": "../../sdk/lib/collection/collection.dart",
-        "patches": "../../sdk/lib/_internal/js_runtime/lib/collection_patch.dart"
+        "uri": "collection/collection.dart",
+        "patches": "_internal/js_runtime/lib/collection_patch.dart"
       },
       "convert": {
-        "uri": "../../sdk/lib/convert/convert.dart",
-        "patches": "../../sdk/lib/_internal/js_runtime/lib/convert_patch.dart"
+        "uri": "convert/convert.dart",
+        "patches": "_internal/js_runtime/lib/convert_patch.dart"
       },
       "core": {
-        "uri": "../../sdk/lib/core/core.dart",
-        "patches": "../../sdk/lib/_internal/js_runtime/lib/core_patch.dart"
+        "uri": "core/core.dart",
+        "patches": "_internal/js_runtime/lib/core_patch.dart"
       },
       "developer": {
-        "uri": "../../sdk/lib/developer/developer.dart",
-        "patches": "../../sdk/lib/_internal/js_runtime/lib/developer_patch.dart"
+        "uri": "developer/developer.dart",
+        "patches": "_internal/js_runtime/lib/developer_patch.dart"
       },
       "_http": {
-        "uri": "../../sdk/lib/_http/http.dart"
+        "uri": "_http/http.dart"
       },
       "io": {
-        "uri": "../../sdk/lib/io/io.dart",
-        "patches": "../../sdk/lib/_internal/js_runtime/lib/io_patch.dart",
+        "uri": "io/io.dart",
+        "patches": "_internal/js_runtime/lib/io_patch.dart",
         "supported": false
       },
       "isolate": {
-        "uri": "../../sdk/lib/isolate/isolate.dart",
-        "patches": "../../sdk/lib/_internal/js_runtime/lib/isolate_patch.dart",
+        "uri": "isolate/isolate.dart",
+        "patches": "_internal/js_runtime/lib/isolate_patch.dart",
         "supported": false
       },
       "js": {
-        "uri": "../../sdk/lib/js/js.dart",
-        "patches": "../../sdk/lib/_internal/js_runtime/lib/js_patch.dart"
+        "uri": "js/js.dart",
+        "patches": "_internal/js_runtime/lib/js_patch.dart"
       },
       "_js": {
-        "uri": "../../sdk/lib/js/_js.dart",
-        "patches": "../../sdk/lib/js/_js_server.dart"
+        "uri": "js/_js.dart",
+        "patches": "js/_js_server.dart"
       },
       "js_util": {
-        "uri": "../../sdk/lib/js_util/js_util.dart"
+        "uri": "js_util/js_util.dart"
       },
       "math": {
-        "uri": "../../sdk/lib/math/math.dart",
-        "patches": "../../sdk/lib/_internal/js_runtime/lib/math_patch.dart"
+        "uri": "math/math.dart",
+        "patches": "_internal/js_runtime/lib/math_patch.dart"
       },
       "typed_data": {
         "uri": "typed_data/typed_data.dart",
@@ -330,35 +330,35 @@
         "uri": "_internal/js_runtime/lib/native_typed_data.dart"
       },
       "_internal": {
-        "uri": "../../sdk/lib/internal/internal.dart",
-        "patches": "../../sdk/lib/_internal/js_runtime/lib/internal_patch.dart"
+        "uri": "internal/internal.dart",
+        "patches": "_internal/js_runtime/lib/internal_patch.dart"
       },
       "_js_helper": {
-        "uri": "../../sdk/lib/_internal/js_runtime/lib/js_helper.dart"
+        "uri": "_internal/js_runtime/lib/js_helper.dart"
       },
       "_rti": {
-        "uri": "../../sdk/lib/_internal/js_runtime/lib/rti.dart"
+        "uri": "_internal/js_runtime/lib/rti.dart"
       },
       "_interceptors": {
-        "uri": "../../sdk/lib/_internal/js_runtime/lib/interceptors.dart"
+        "uri": "_internal/js_runtime/lib/interceptors.dart"
       },
       "_foreign_helper": {
-        "uri": "../../sdk/lib/_internal/js_runtime/lib/foreign_helper.dart"
+        "uri": "_internal/js_runtime/lib/foreign_helper.dart"
       },
       "_js_names": {
-        "uri": "../../sdk/lib/_internal/js_runtime/lib/js_names.dart"
+        "uri": "_internal/js_runtime/lib/js_names.dart"
       },
       "_js_primitives": {
-        "uri": "../../sdk/lib/_internal/js_runtime/lib/js_primitives.dart"
+        "uri": "_internal/js_runtime/lib/js_primitives.dart"
       },
       "_js_embedded_names": {
-        "uri": "../../sdk/lib/_internal/js_runtime/lib/shared/embedded_names.dart"
+        "uri": "_internal/js_runtime/lib/shared/embedded_names.dart"
       },
       "_async_await_error_codes": {
-        "uri": "../../sdk/lib/_internal/js_runtime/lib/shared/async_await_error_codes.dart"
+        "uri": "_internal/js_runtime/lib/shared/async_await_error_codes.dart"
       },
       "_recipe_syntax": {
-        "uri": "../../sdk/lib/_internal/js_runtime/lib/shared/recipe_syntax.dart"
+        "uri": "_internal/js_runtime/lib/shared/recipe_syntax.dart"
       }
     }
   },
diff --git a/sdk_nnbd/lib/libraries.yaml b/sdk_nnbd/lib/libraries.yaml
index 16f2d053c15..8dd0eeb92d4 100644
--- a/sdk_nnbd/lib/libraries.yaml
+++ b/sdk_nnbd/lib/libraries.yaml
@@ -158,164 +158,164 @@ vm:
 dart2js:
   libraries:
     async:
-      uri: "../../sdk/lib/async/async.dart"
-      patches: "../../sdk/lib/_internal/js_runtime/lib/async_patch.dart"
+      uri: "async/async.dart"
+      patches: "_internal/js_runtime/lib/async_patch.dart"
 
     collection:
-      uri: "../../sdk/lib/collection/collection.dart"
-      patches: "../../sdk/lib/_internal/js_runtime/lib/collection_patch.dart"
+      uri: "collection/collection.dart"
+      patches: "_internal/js_runtime/lib/collection_patch.dart"
 
     convert:
-      uri: "../../sdk/lib/convert/convert.dart"
-      patches: "../../sdk/lib/_internal/js_runtime/lib/convert_patch.dart"
+      uri: "convert/convert.dart"
+      patches: "_internal/js_runtime/lib/convert_patch.dart"
 
     core:
-      uri: "../../sdk/lib/core/core.dart"
-      patches: "../../sdk/lib/_internal/js_runtime/lib/core_patch.dart"
+      uri: "core/core.dart"
+      patches: "_internal/js_runtime/lib/core_patch.dart"
 
     developer:
-      uri: "../../sdk/lib/developer/developer.dart"
-      patches: "../../sdk/lib/_internal/js_runtime/lib/developer_patch.dart"
+      uri: "developer/developer.dart"
+      patches: "_internal/js_runtime/lib/developer_patch.dart"
 
     html:
-      uri: "../../sdk/lib/html/dart2js/html_dart2js.dart"
+      uri: "html/dart2js/html_dart2js.dart"
 
     html_common:
-      uri: "../../sdk/lib/html/html_common/html_common_dart2js.dart"
+      uri: "html/html_common/html_common_dart2js.dart"
 
     indexed_db:
-      uri: "../../sdk/lib/indexed_db/dart2js/indexed_db_dart2js.dart"
+      uri: "indexed_db/dart2js/indexed_db_dart2js.dart"
 
     _http:
-      uri: "../../sdk/lib/_http/http.dart"
+      uri: "_http/http.dart"
 
     io:
-      uri: "../../sdk/lib/io/io.dart"
-      patches: "../../sdk/lib/_internal/js_runtime/lib/io_patch.dart"
+      uri: "io/io.dart"
+      patches: "_internal/js_runtime/lib/io_patch.dart"
       supported: false
 
     isolate:
-      uri: "../../sdk/lib/isolate/isolate.dart"
-      patches: "../../sdk/lib/_internal/js_runtime/lib/isolate_patch.dart"
+      uri: "isolate/isolate.dart"
+      patches: "_internal/js_runtime/lib/isolate_patch.dart"
       supported: false
 
     js:
-      uri: "../../sdk/lib/js/js.dart"
-      patches: "../../sdk/lib/_internal/js_runtime/lib/js_patch.dart"
+      uri: "js/js.dart"
+      patches: "_internal/js_runtime/lib/js_patch.dart"
 
     _js:
-      uri: "../../sdk/lib/js/_js.dart"
-      patches: "../../sdk/lib/js/_js_client.dart"
+      uri: "js/_js.dart"
+      patches: "js/_js_client.dart"
 
     js_util:
-      uri: "../../sdk/lib/js_util/js_util.dart"
+      uri: "js_util/js_util.dart"
 
     math:
-      uri: "../../sdk/lib/math/math.dart"
-      patches: "../../sdk/lib/_internal/js_runtime/lib/math_patch.dart"
+      uri: "math/math.dart"
+      patches: "_internal/js_runtime/lib/math_patch.dart"
 
     typed_data:
-      uri: "../../sdk/lib/typed_data/typed_data.dart"
-      patches: "../../sdk/lib/_internal/js_runtime/lib/typed_data_patch.dart"
+      uri: "typed_data/typed_data.dart"
+      patches: "_internal/js_runtime/lib/typed_data_patch.dart"
 
     _native_typed_data:
-      uri: "../../sdk/lib/_internal/js_runtime/lib/native_typed_data.dart"
+      uri: "_internal/js_runtime/lib/native_typed_data.dart"
 
     svg:
-      uri: "../../sdk/lib/svg/dart2js/svg_dart2js.dart"
+      uri: "svg/dart2js/svg_dart2js.dart"
 
     web_audio:
-      uri: "../../sdk/lib/web_audio/dart2js/web_audio_dart2js.dart"
+      uri: "web_audio/dart2js/web_audio_dart2js.dart"
 
     web_gl:
-      uri: "../../sdk/lib/web_gl/dart2js/web_gl_dart2js.dart"
+      uri: "web_gl/dart2js/web_gl_dart2js.dart"
 
     web_sql:
-      uri: "../../sdk/lib/web_sql/dart2js/web_sql_dart2js.dart"
+      uri: "web_sql/dart2js/web_sql_dart2js.dart"
 
     _internal:
-      uri: "../../sdk/lib/internal/internal.dart"
-      patches: "../../sdk/lib/_internal/js_runtime/lib/internal_patch.dart"
+      uri: "internal/internal.dart"
+      patches: "_internal/js_runtime/lib/internal_patch.dart"
 
     _js_helper:
-      uri: "../../sdk/lib/_internal/js_runtime/lib/js_helper.dart"
+      uri: "_internal/js_runtime/lib/js_helper.dart"
 
     _rti:
-      uri: "../../sdk/lib/_internal/js_runtime/lib/rti.dart"
+      uri: "_internal/js_runtime/lib/rti.dart"
 
     _interceptors:
-      uri: "../../sdk/lib/_internal/js_runtime/lib/interceptors.dart"
+      uri: "_internal/js_runtime/lib/interceptors.dart"
 
     _foreign_helper:
-      uri: "../../sdk/lib/_internal/js_runtime/lib/foreign_helper.dart"
+      uri: "_internal/js_runtime/lib/foreign_helper.dart"
 
     _js_names:
-      uri: "../../sdk/lib/_internal/js_runtime/lib/js_names.dart"
+      uri: "_internal/js_runtime/lib/js_names.dart"
 
     _js_primitives:
-      uri: "../../sdk/lib/_internal/js_runtime/lib/js_primitives.dart"
+      uri: "_internal/js_runtime/lib/js_primitives.dart"
 
     _js_embedded_names:
-      uri: "../../sdk/lib/_internal/js_runtime/lib/shared/embedded_names.dart"
+      uri: "_internal/js_runtime/lib/shared/embedded_names.dart"
 
     _async_await_error_codes:
-      uri: "../../sdk/lib/_internal/js_runtime/lib/shared/async_await_error_codes.dart"
+      uri: "_internal/js_runtime/lib/shared/async_await_error_codes.dart"
 
     _recipe_syntax:
-      uri: "../../sdk/lib/_internal/js_runtime/lib/shared/recipe_syntax.dart"
+      uri: "_internal/js_runtime/lib/shared/recipe_syntax.dart"
 
     _metadata:
-      uri: "../../sdk/lib/html/html_common/metadata.dart"
+      uri: "html/html_common/metadata.dart"
 
 dart2js_server:
   libraries:
     async:
-      uri: "../../sdk/lib/async/async.dart"
-      patches: "../../sdk/lib/_internal/js_runtime/lib/async_patch.dart"
+      uri: "async/async.dart"
+      patches: "_internal/js_runtime/lib/async_patch.dart"
 
     collection:
-      uri: "../../sdk/lib/collection/collection.dart"
-      patches: "../../sdk/lib/_internal/js_runtime/lib/collection_patch.dart"
+      uri: "collection/collection.dart"
+      patches: "_internal/js_runtime/lib/collection_patch.dart"
 
     convert:
-      uri: "../../sdk/lib/convert/convert.dart"
-      patches: "../../sdk/lib/_internal/js_runtime/lib/convert_patch.dart"
+      uri: "convert/convert.dart"
+      patches: "_internal/js_runtime/lib/convert_patch.dart"
 
     core:
-      uri: "../../sdk/lib/core/core.dart"
-      patches: "../../sdk/lib/_internal/js_runtime/lib/core_patch.dart"
+      uri: "core/core.dart"
+      patches: "_internal/js_runtime/lib/core_patch.dart"
 
     developer:
-      uri: "../../sdk/lib/developer/developer.dart"
-      patches: "../../sdk/lib/_internal/js_runtime/lib/developer_patch.dart"
+      uri: "developer/developer.dart"
+      patches: "_internal/js_runtime/lib/developer_patch.dart"
 
     _http:
-      uri: "../../sdk/lib/_http/http.dart"
+      uri: "_http/http.dart"
 
     io:
-      uri: "../../sdk/lib/io/io.dart"
-      patches: "../../sdk/lib/_internal/js_runtime/lib/io_patch.dart"
+      uri: "io/io.dart"
+      patches: "_internal/js_runtime/lib/io_patch.dart"
       supported: false
 
     isolate:
-      uri: "../../sdk/lib/isolate/isolate.dart"
-      patches: "../../sdk/lib/_internal/js_runtime/lib/isolate_patch.dart"
+      uri: "isolate/isolate.dart"
+      patches: "_internal/js_runtime/lib/isolate_patch.dart"
       supported: false
 
     js:
-      uri: "../../sdk/lib/js/js.dart"
-      patches: "../../sdk/lib/_internal/js_runtime/lib/js_patch.dart"
+      uri: "js/js.dart"
+      patches: "_internal/js_runtime/lib/js_patch.dart"
 
     _js:
-      uri: "../../sdk/lib/js/_js.dart"
-      patches: "../../sdk/lib/js/_js_server.dart"
+      uri: "js/_js.dart"
+      patches: "js/_js_server.dart"
 
     js_util:
-      uri: "../../sdk/lib/js_util/js_util.dart"
+      uri: "js_util/js_util.dart"
 
     math:
-      uri: "../../sdk/lib/math/math.dart"
-      patches: "../../sdk/lib/_internal/js_runtime/lib/math_patch.dart"
+      uri: "math/math.dart"
+      patches: "_internal/js_runtime/lib/math_patch.dart"
 
     typed_data:
       uri: "typed_data/typed_data.dart"
@@ -325,35 +325,35 @@ dart2js_server:
       uri: "_internal/js_runtime/lib/native_typed_data.dart"
 
     _internal:
-      uri: "../../sdk/lib/internal/internal.dart"
-      patches: "../../sdk/lib/_internal/js_runtime/lib/internal_patch.dart"
+      uri: "internal/internal.dart"
+      patches: "_internal/js_runtime/lib/internal_patch.dart"
 
     _js_helper:
-      uri: "../../sdk/lib/_internal/js_runtime/lib/js_helper.dart"
+      uri: "_internal/js_runtime/lib/js_helper.dart"
 
     _rti:
-      uri: "../../sdk/lib/_internal/js_runtime/lib/rti.dart"
+      uri: "_internal/js_runtime/lib/rti.dart"
 
     _interceptors:
-      uri: "../../sdk/lib/_internal/js_runtime/lib/interceptors.dart"
+      uri: "_internal/js_runtime/lib/interceptors.dart"
 
     _foreign_helper:
-      uri: "../../sdk/lib/_internal/js_runtime/lib/foreign_helper.dart"
+      uri: "_internal/js_runtime/lib/foreign_helper.dart"
 
     _js_names:
-      uri: "../../sdk/lib/_internal/js_runtime/lib/js_names.dart"
+      uri: "_internal/js_runtime/lib/js_names.dart"
 
     _js_primitives:
-      uri: "../../sdk/lib/_internal/js_runtime/lib/js_primitives.dart"
+      uri: "_internal/js_runtime/lib/js_primitives.dart"
 
     _js_embedded_names:
-      uri: "../../sdk/lib/_internal/js_runtime/lib/shared/embedded_names.dart"
+      uri: "_internal/js_runtime/lib/shared/embedded_names.dart"
 
     _async_await_error_codes:
-      uri: "../../sdk/lib/_internal/js_runtime/lib/shared/async_await_error_codes.dart"
+      uri: "_internal/js_runtime/lib/shared/async_await_error_codes.dart"
 
     _recipe_syntax:
-      uri: "../../sdk/lib/_internal/js_runtime/lib/shared/recipe_syntax.dart"
+      uri: "_internal/js_runtime/lib/shared/recipe_syntax.dart"
 
 dartdevc:
     libraries:
diff --git a/tools/bots/test_matrix.json b/tools/bots/test_matrix.json
index 01442974d19..12431b67adc 100644
--- a/tools/bots/test_matrix.json
+++ b/tools/bots/test_matrix.json
@@ -2478,9 +2478,7 @@
             "--enable-experiment=non-nullable",
             "pkg/dev_compiler/tool/check_nnbd_sdk.dart",
             "--target",
-            "dart2js",
-            "--libraries",
-            "sdk_nnbd/lib/dart2js_migration_libraries.json"
+            "dart2js"
           ]
         },
         {
diff --git a/utils/compiler/BUILD.gn b/utils/compiler/BUILD.gn
index 03fe4dff3b3..6091b6c4b92 100644
--- a/utils/compiler/BUILD.gn
+++ b/utils/compiler/BUILD.gn
@@ -72,9 +72,14 @@ application_snapshot("dart2js") {
 
   if (use_nnbd) {
     training_args += [ "--enable-experiment=non-nullable" ]
-  }
 
-  training_args += [ rebase_path("$target_gen_dir/dart2js.dart") ]
+    # TODO(joshualitt): restore training with full dart2js. The major known
+    # issue is missing runtime type information in certain cases.
+    training_args +=
+        [ rebase_path("../../tests/language_2/abstract/equal_test.dart") ]
+  } else {
+    training_args += [ rebase_path("$target_gen_dir/dart2js.dart") ]
+  }
 }
 
 compile_platform("compile_dart2js_platform") {