diff --git a/core/modules/block_place/block_place.module b/core/modules/block_place/block_place.module
index b6239cd..7146509 100644
--- a/core/modules/block_place/block_place.module
+++ b/core/modules/block_place/block_place.module
@@ -7,7 +7,6 @@
 
 use Drupal\Core\Routing\RouteMatchInterface;
 use Drupal\Core\Url;
-use Symfony\Cmf\Component\Routing\RouteObjectInterface;
 
 /**
  * Implements hook_help().
@@ -52,8 +51,7 @@ function block_place_toolbar() {
   // Remove on Admin routes.
   $admin_route = \Drupal::service('router.admin_context')->isAdminRoute();
   // Remove on Block Demo page.
-  $route_name = \Drupal::request()->get(RouteObjectInterface::ROUTE_NAME);
-  $admin_demo = ($route_name == 'block.admin_demo') ? TRUE : FALSE;
+  $admin_demo = \Drupal::routeMatch()->getRouteName() === 'block.admin_demo';
   $access = (\Drupal::currentUser()->hasPermission('administer blocks') && !$admin_route && !$admin_demo);
 
   // The 'Place Block' tab is a simple link, with no corresponding tray.
diff --git a/core/modules/block_place/css/block-place.css b/core/modules/block_place/css/block-place.css
index cb0cf86..0b6af3a 100644
--- a/core/modules/block_place/css/block-place.css
+++ b/core/modules/block_place/css/block-place.css
@@ -1,7 +1,7 @@
 .block-region {
   background-color: #ff6;
   padding: .75em 1em;
-  text-align:center;
+  text-align: center;
 }
 
 .block-region a {
diff --git a/core/themes/stable/css/block_place/block-place.css b/core/themes/stable/css/block_place/block-place.css
index cb0cf86..0b6af3a 100644
--- a/core/themes/stable/css/block_place/block-place.css
+++ b/core/themes/stable/css/block_place/block-place.css
@@ -1,7 +1,7 @@
 .block-region {
   background-color: #ff6;
   padding: .75em 1em;
-  text-align:center;
+  text-align: center;
 }
 
 .block-region a {