core/lib/Drupal/Core/Asset/JsCollectionOptimizer.php             | 9 ++++-----
 .../lib/Drupal/system/Controller/AssetLicenseInfoController.php  | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/core/lib/Drupal/Core/Asset/JsCollectionOptimizer.php b/core/lib/Drupal/Core/Asset/JsCollectionOptimizer.php
index 5d3ba68..7cfaa28 100644
--- a/core/lib/Drupal/Core/Asset/JsCollectionOptimizer.php
+++ b/core/lib/Drupal/Core/Asset/JsCollectionOptimizer.php
@@ -89,11 +89,10 @@ public function optimize(array $js_assets) {
     // Group the assets.
     $js_groups = $this->grouper->group($js_assets);
 
-    // Now optimize (concatenate, not minify) and dump each asset group, unless
-    // that was already done, in which case it should appear in
-    // system.js_optimized_aggregate_files (but also the unoptimized equivalent
-    // in system.js_unoptimized_aggregate_files, for JavaScript Web License
-    // Labels compliance).
+    // Now optimize each asset in the asset group, concatenate them to generate
+    // the aggregate and finally dump the result. Also create an unoptimized
+    // equivalent, for JavaScript Web License Labels compliance. We track the
+    // aggregates we've already generated, to avoid all this work if possible.
     // Drupal contrib can override this default JS aggregator to keep the same
     // grouping, optimizing and dumping, but change the strategy that is used to
     // determine when the aggregate should be rebuilt (e.g. mtime, HTTPS …).
diff --git a/core/modules/system/lib/Drupal/system/Controller/AssetLicenseInfoController.php b/core/modules/system/lib/Drupal/system/Controller/AssetLicenseInfoController.php
index ad2cedf..acac4c0 100644
--- a/core/modules/system/lib/Drupal/system/Controller/AssetLicenseInfoController.php
+++ b/core/modules/system/lib/Drupal/system/Controller/AssetLicenseInfoController.php
@@ -61,7 +61,7 @@ public function jslicense() {
       $libraries = $this->libraryDiscovery->getLibrariesByExtension($extension);
       $rows_for_extension = array();
       foreach ($libraries as $library) {
-        $license_column = l($library['license']['name'], $library['license']['remote']);
+        $license_column = l($library['license']['name'], $library['license']['url']);
         if (!isset($library['js'])) {
           continue;
         }