diff --git a/core/modules/contextual/contextual.module b/core/modules/contextual/contextual.module
index 2505e77cd44..019efedef0b 100644
--- a/core/modules/contextual/contextual.module
+++ b/core/modules/contextual/contextual.module
@@ -142,7 +142,6 @@ function contextual_library_info() {
       array('system', 'jquery.once'),
       array('system', 'drupal.tabbingmanager'),
       array('system', 'drupal.announce'),
-      array('contextual', 'drupal.contextual-links')
     ),
   );
 
diff --git a/core/modules/contextual/contextual.toolbar.js b/core/modules/contextual/contextual.toolbar.js
index 0059868f6be..feea0cfdbd4 100644
--- a/core/modules/contextual/contextual.toolbar.js
+++ b/core/modules/contextual/contextual.toolbar.js
@@ -43,25 +43,27 @@ function initContextualToolbar (context) {
   });
 
   // Show the edit tab while there's >=1 contextual link.
-  var contextualCollection = Drupal.contextual.collection;
-  function trackContextualCount () {
-    model.set('contextualCount', contextualCollection.length);
-  }
-  contextualCollection.on('reset remove add', trackContextualCount);
-  trackContextualCount();
+  if (Drupal.contextual && Drupal.contextual.collection) {
+    var contextualCollection = Drupal.contextual.collection;
+    var trackContextualCount = function () {
+      model.set('contextualCount', contextualCollection.length);
+    };
+    contextualCollection.on('reset remove add', trackContextualCount);
+    trackContextualCount();
 
-  // Whenever edit mode is toggled, lock all contextual links.
-  model.on('change:isViewing', function() {
-    contextualCollection.each(function (contextualModel) {
-      contextualModel.set('isLocked', !model.get('isViewing'));
+    // Whenever edit mode is toggled, lock all contextual links.
+    model.on('change:isViewing', function() {
+      contextualCollection.each(function (contextualModel) {
+        contextualModel.set('isLocked', !model.get('isViewing'));
+      });
     });
-  });
-  // When a new contextual link is added and edit mode is enabled, lock it.
-  contextualCollection.on('add', function (contextualModel) {
-    if (!model.get('isViewing')) {
-      contextualModel.set('isLocked', true);
-    }
-  });
+    // When a new contextual link is added and edit mode is enabled, lock it.
+    contextualCollection.on('add', function (contextualModel) {
+      if (!model.get('isViewing')) {
+        contextualModel.set('isLocked', true);
+      }
+    });
+  }
 
   // Checks whether localStorage indicates we should start in edit mode
   // rather than view mode.