diff --git a/core/lib/Drupal/Core/Entity/EntityAccessController.php b/core/lib/Drupal/Core/Entity/EntityAccessController.php
index 835bb5a..e6b6498 100644
--- a/core/lib/Drupal/Core/Entity/EntityAccessController.php
+++ b/core/lib/Drupal/Core/Entity/EntityAccessController.php
@@ -100,9 +100,6 @@ protected function processAccessHookResults(array $access) {
     if (in_array(FALSE, $access, TRUE)) {
       return FALSE;
     }
-    elseif (in_array(TRUE, $access, TRUE)) {
-      return TRUE;
-    }
     else {
       return;
     }
diff --git a/core/modules/block/lib/Drupal/block/Tests/BlockTest.php b/core/modules/block/lib/Drupal/block/Tests/BlockTest.php
index e7b99e1..1e2a2a1 100644
--- a/core/modules/block/lib/Drupal/block/Tests/BlockTest.php
+++ b/core/modules/block/lib/Drupal/block/Tests/BlockTest.php
@@ -63,6 +63,43 @@ function testBlockVisibility() {
   }
 
   /**
+   * Tests block visibility per content type.
+   */
+  public function testBlockVisibilityPerContentType() {
+    module_install(array('node'));
+    $this->drupalCreateContentType(array('type' => 'content_type_name'));
+    $node = $this->drupalCreateNode(array('type' => 'content_type_name'));
+    \Drupal::service('router.builder')->rebuild();
+    $block_name = 'system_powered_by_block';
+    // Create a random title for the block.
+    $title = $this->randomName(8);
+    // Enable a standard block.
+    $default_theme = \Drupal::config('system.theme')->get('default');
+    $edit = array(
+      'id' => strtolower($this->randomName(8)),
+      'region' => 'sidebar_first',
+      'settings[label]' => $title,
+    );
+    // Set the block to be shown on node pages for 'content_type_name' only to
+    // authenticated users.
+    $edit['visibility[node_type][types][content_type_name]'] = 'content_type_name';
+    $edit['visibility[role][roles][' . DRUPAL_AUTHENTICATED_RID . ']'] = TRUE;
+    $this->drupalPostForm('admin/structure/block/add/' . $block_name . '/' . $default_theme, $edit, t('Save block'));
+    $this->assertText('The block configuration has been saved.', 'Block was saved');
+
+    $this->drupalGet('');
+    $this->assertNoText($title, 'Block was not displayed on the front page.');
+
+    $this->drupalGet($node->url());
+    $this->assertText($title, 'Block was displayed according to block visibility rules.');
+
+    // Confirm that the block is not displayed to anonymous users.
+    $this->drupalLogout();
+    $this->drupalGet($node->url());
+    $this->assertNoText($title, 'Block was not displayed to anonymous users.');
+  }
+
+  /**
    * Test block visibility when using "pages" restriction but leaving
    * "pages" textarea empty
    */