diff --git a/core/modules/block/src/EventSubscriber/NodeRouteContext.php b/core/modules/block/src/EventSubscriber/NodeRouteContext.php
index cfa06a0..a25da2f 100644
--- a/core/modules/block/src/EventSubscriber/NodeRouteContext.php
+++ b/core/modules/block/src/EventSubscriber/NodeRouteContext.php
@@ -40,16 +40,16 @@ public function __construct(RouteMatchInterface $route_match) {
    */
   public function onBlockActiveContext(BlockContextEvent $event) {
     if (($route_object = $this->routeMatch->getRouteObject()) && ($route_contexts = $route_object->getOption('parameters')) && isset($route_contexts['node'])) {
-      $context = new Context(new ContextDefinition($route_contexts['node']['type']));
+      $context = Context::__construct(ContextDefinition::__construct($route_contexts['node']['type']));
       if ($node = $this->routeMatch->getParameter('node')) {
-        $context->setContextValue($node);
+        Context::setContextValue($node);
       }
       $event->setContext('node', $context);
     }
     elseif ($this->routeMatch->getRouteName() == 'node.add') {
       $node_type = $this->routeMatch->getParameter('node_type');
-      $context = new Context(new ContextDefinition('entity:node'));
-      $context->setContextValue(Node::create(array('type' => $node_type->id())));
+      $context = Context::__construct(ContextDefinition::__construct('entity:node'));
+      Context::setContextValue(Node::create(array('type' => $node_type->id())));
       $event->setContext('node', $context);
     }
   }
diff --git a/core/modules/node/src/Tests/NodeBlockFunctionalTest.php b/core/modules/node/src/Tests/NodeBlockFunctionalTest.php
index 5f241c0..44bae18 100644
--- a/core/modules/node/src/Tests/NodeBlockFunctionalTest.php
+++ b/core/modules/node/src/Tests/NodeBlockFunctionalTest.php
@@ -124,7 +124,7 @@ public function testRecentNodeBlock() {
       'visibility' => array(
         'node_type' => array(
           'context_mapping' => array(
-            'node' => 'node.node',
+            'node' => 'node',
           ),
           'bundles' => array(
             'article' => 'article',