diff --git a/core/modules/book/book.module b/core/modules/book/book.module
index 060fa8d..86fcdb7 100644
--- a/core/modules/book/book.module
+++ b/core/modules/book/book.module
@@ -188,7 +188,7 @@ function book_menu() {
   );
   $items['node/%node/outline/remove'] = array(
     'title' => 'Remove from outline',
-    'route' => 'book_remove',
+    'route_name' => 'book_remove',
   );
 
   return $items;
diff --git a/core/modules/book/book.routing.yml b/core/modules/book/book.routing.yml
index 69c31d7..ece367a 100644
--- a/core/modules/book/book.routing.yml
+++ b/core/modules/book/book.routing.yml
@@ -4,5 +4,5 @@ book_remove:
     _form: '\Drupal\book\Form\BookRemoveForm'
   requirements:
     _permission: 'administer book outlines'
-    _book_node_access: 'view'
+    _node_access: 'view'
     _book_node_is_removable: 'TRUE'
diff --git a/core/modules/book/lib/Drupal/book/Access/BookNodeAccessCheck.php b/core/modules/book/lib/Drupal/book/Access/BookNodeAccessCheck.php
deleted file mode 100644
index fcb56aa..0000000
--- a/core/modules/book/lib/Drupal/book/Access/BookNodeAccessCheck.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains Drupal\book\Access\BookNodeAccessCheck.
- */
-
-namespace Drupal\book\Access;
-
-use Drupal\Core\Access\AccessCheckInterface;
-use Symfony\Component\Routing\Route;
-use Symfony\Component\HttpFoundation\Request;
-
-/**
- * Determines access to administer the requested node's book outline.
- */
-class BookNodeAccessCheck implements AccessCheckInterface {
-
-  /**
-   * Implements AccessCheckInterface::applies().
-   */
-  public function applies(Route $route) {
-    return array_key_exists('_book_node_access', $route->getRequirements());
-  }
-
-  /**
-   * Implements AccessCheckInterface::access().
-   */
-  public function access(Route $route, Request $request) {
-    $node = $request->attributes->get('node');
-    $op = $route->getRequirement('_book_node_access');
-    if (!node_access($op, $node)) {
-      return FALSE;
-    }
-  }
-}
diff --git a/core/modules/book/lib/Drupal/book/BookBundle.php b/core/modules/book/lib/Drupal/book/BookBundle.php
index 75c26d5..2b674f6 100644
--- a/core/modules/book/lib/Drupal/book/BookBundle.php
+++ b/core/modules/book/lib/Drupal/book/BookBundle.php
@@ -21,7 +21,5 @@ class BookBundle extends Bundle {
   public function build(ContainerBuilder $container) {
     $container->register('access_check.book.removable', 'Drupal\book\Access\BookNodeIsRemovableAccessCheck')
       ->addTag('access_check');
-    $container->register('access_check.book.node_access', 'Drupal\book\Access\BookNodeAccessCheck')
-      ->addTag('access_check');
   }
 }
diff --git a/core/modules/book/lib/Drupal/book/Form/BookRemoveForm.php b/core/modules/book/lib/Drupal/book/Form/BookRemoveForm.php
index c6da0ae..cbf5a97 100644
--- a/core/modules/book/lib/Drupal/book/Form/BookRemoveForm.php
+++ b/core/modules/book/lib/Drupal/book/Form/BookRemoveForm.php
@@ -9,6 +9,9 @@
 
 class BookRemoveForm implements ControllerInterface, FormInterface {
 
+  /**
+   * Stores a \Drupal\Core\Database\Connection instance.
+   */
   protected $database;
 
   /**
diff --git a/core/modules/node/lib/Drupal/node/Access/NodeAccessCheck.php b/core/modules/node/lib/Drupal/node/Access/NodeAccessCheck.php
new file mode 100644
index 0000000..b41f451
--- /dev/null
+++ b/core/modules/node/lib/Drupal/node/Access/NodeAccessCheck.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * @file
+ * Contains Drupal\node\Access\NodeAccessCheck.
+ */
+
+namespace Drupal\node\Access;
+
+use Drupal\Core\Access\AccessCheckInterface;
+use Symfony\Component\Routing\Route;
+use Symfony\Component\HttpFoundation\Request;
+
+/**
+ * Determines access to a particular operation on the requested node.
+ */
+class NodeAccessCheck implements AccessCheckInterface {
+
+  /**
+   * Implements AccessCheckInterface::applies().
+   */
+  public function applies(Route $route) {
+    return array_key_exists('_node_access', $route->getRequirements());
+  }
+
+  /**
+   * Implements AccessCheckInterface::access().
+   */
+  public function access(Route $route, Request $request) {
+    $node = $request->attributes->get('node');
+    $op = $route->getRequirement('_node_access');
+    if (!node_access($op, $node)) {
+      return FALSE;
+    }
+  }
+}
diff --git a/core/modules/node/lib/Drupal/node/NodeBundle.php b/core/modules/node/lib/Drupal/node/NodeBundle.php
new file mode 100644
index 0000000..e85dd0b
--- /dev/null
+++ b/core/modules/node/lib/Drupal/node/NodeBundle.php
@@ -0,0 +1,25 @@
+<?php
+
+/**
+ * @file
+ * Contains Drupal\node\NodeBundle.
+ */
+
+namespace Drupal\node;
+
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\HttpKernel\Bundle\Bundle;
+
+/**
+ * User dependency injection container.
+ */
+class NodeBundle extends Bundle {
+
+  /**
+   * Overrides Symfony\Component\HttpKernel\Bundle\Bundle::build().
+   */
+  public function build(ContainerBuilder $container) {
+    $container->register('access_check.node.node_access', 'Drupal\node\Access\NodeAccessCheck')
+      ->addTag('access_check');
+  }
+}