diff --git a/core/modules/block/lib/Drupal/block/Plugin/views/display/Block.php b/core/modules/block/lib/Drupal/block/Plugin/views/display/Block.php
index 56a25cb..02c7f10 100644
--- a/core/modules/block/lib/Drupal/block/Plugin/views/display/Block.php
+++ b/core/modules/block/lib/Drupal/block/Plugin/views/display/Block.php
@@ -54,7 +54,7 @@ public function execute() {
     // display, and arguments should be set on the view.
     $element = $this->view->render();
     if (!empty($this->view->result) || $this->getOption('empty') || !empty($this->view->style_plugin->definition['even empty'])) {
-      return drupal_render($element);
+      return $element;
     }
   }
 
diff --git a/core/modules/views/lib/Drupal/views/Plugin/block/block/ViewsBlock.php b/core/modules/views/lib/Drupal/views/Plugin/block/block/ViewsBlock.php
index 7cac4f6..bef60d4 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/block/block/ViewsBlock.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/block/block/ViewsBlock.php
@@ -100,12 +100,6 @@ public function build() {
   protected function addContextualLinks(&$output, $block_type = 'block') {
     // Do not add contextual links to an empty block.
     if (!empty($output)) {
-      // Contextual links only work on blocks whose content is a renderable
-      // array, so if the block contains a string of already-rendered markup,
-      // convert it to an array.
-      if (is_string($output)) {
-        $output = array('#markup' => $output);
-      }
       // Add the contextual links.
       views_add_contextual_links($output, $block_type, $this->view, $this->displayID);
     }
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php
index 0c4d150..f8e33f7 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php
@@ -2652,8 +2652,9 @@ public function getSpecialBlocks() {
    *  The rendered exposed form as string or NULL otherwise.
    */
   public function viewExposedFormBlocks() {
-    // avoid interfering with the admin forms.
-    if (arg(0) == 'admin' && arg(1) == 'structure' && arg(2) == 'views') {
+    // Avoid interfering with the admin forms.
+    $item = menu_get_item();
+    if (strpos($item['path'], 'admin/structure/views') !== FALSE) {
       return;
     }
     $this->view->initHandlers();