diff --git a/core/modules/breakpoint/breakpoint.install b/core/modules/breakpoint/breakpoint.install
index cba7b1b..dcc0b35 100644
--- a/core/modules/breakpoint/breakpoint.install
+++ b/core/modules/breakpoint/breakpoint.install
@@ -9,8 +9,6 @@
  * Implements hook_enable().
  *
  * Import breakpoints from all enabled themes.
- *
- * @todo: This should be removed if https://drupal.org/node/1813100 is resolved.
  */
 function breakpoint_enable() {
   // Import breakpoints from themes.
@@ -18,5 +16,5 @@ function breakpoint_enable() {
   _breakpoint_theme_enabled(array_keys($themes));
 
   // Import breakpoints from modules.
-  _breakpoint_modules_enabled(array_keys(drupal_container()->get('module_handler')->getModuleList()));
+  _breakpoint_modules_enabled(array_keys(Drupal::moduleHandler()->getModuleList()));
 }
diff --git a/core/modules/breakpoint/breakpoint.module b/core/modules/breakpoint/breakpoint.module
index b467011..f22c1c8 100644
--- a/core/modules/breakpoint/breakpoint.module
+++ b/core/modules/breakpoint/breakpoint.module
@@ -202,7 +202,7 @@ function _breakpoint_delete_breakpoints($list, $source_type) {
       $breakpoint_group->delete();
 
       // Get all breakpoints defined by this theme/module.
-      $breakpoint_ids = drupal_container()->get('config.storage')->listAll('breakpoint.breakpoint.' . $source_type . '.' . $breakpoint_group->id() . '.');
+      $breakpoint_ids = Drupal::service('config.storage')->listAll('breakpoint.breakpoint.' . $source_type . '.' . $breakpoint_group->id() . '.');
       $entity_info = entity_get_info('breakpoint');
 
       // Remove the breakpoint.breakpoint part of the breakpoint identifier.