diff --git a/core/modules/aggregator/src/Tests/ImportOpmlTest.php b/core/modules/aggregator/src/Tests/ImportOpmlTest.php
index 5d0ebe7..9e1727f 100644
--- a/core/modules/aggregator/src/Tests/ImportOpmlTest.php
+++ b/core/modules/aggregator/src/Tests/ImportOpmlTest.php
@@ -19,7 +19,7 @@ class ImportOpmlTest extends AggregatorTestBase {
    *
    * @var array
    */
-  public static $modules = array('block');
+  public static $modules = array('block', 'help');
 
   protected function setUp() {
     parent::setUp();
diff --git a/core/modules/block/src/Tests/BlockTestBase.php b/core/modules/block/src/Tests/BlockTestBase.php
index 2adb1ca..bea4040 100644
--- a/core/modules/block/src/Tests/BlockTestBase.php
+++ b/core/modules/block/src/Tests/BlockTestBase.php
@@ -19,7 +19,7 @@
    *
    * @var array
    */
-  public static $modules = array('block', 'filter', 'test_page_test');
+  public static $modules = array('block', 'filter', 'test_page_test', 'help');
 
   /**
    * A list of theme regions to test.
diff --git a/core/modules/block/src/Tests/BlockUiTest.php b/core/modules/block/src/Tests/BlockUiTest.php
index ad949b7..43c29e1 100644
--- a/core/modules/block/src/Tests/BlockUiTest.php
+++ b/core/modules/block/src/Tests/BlockUiTest.php
@@ -21,7 +21,7 @@ class BlockUiTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('block', 'block_test');
+  public static $modules = array('block', 'block_test', 'help');
 
   protected $regions;
 
diff --git a/core/modules/help/help.module b/core/modules/help/help.module
index 3539660..5431243 100644
--- a/core/modules/help/help.module
+++ b/core/modules/help/help.module
@@ -48,3 +48,12 @@ function help_preprocess_block(&$variables) {
     $variables['attributes']['role'] = 'complementary';
   }
 }
+
+/**
+ * Implements hook_block_view_BASE_BLOCK_ID_alter().
+ */
+function help_block_view_system_help_block_alter(array &$build, BlockPluginInterface $block) {
+  // Assume that most users do not need or want to perform contextual actions on
+  // the help block, so don't needlessly draw attention to it.
+  unset($build['#contextual_links']);
+}
diff --git a/core/modules/system/src/Plugin/Block/SystemHelpBlock.php b/core/modules/help/src/Plugin/Block/SystemHelpBlock.php
similarity index 97%
rename from core/modules/system/src/Plugin/Block/SystemHelpBlock.php
rename to core/modules/help/src/Plugin/Block/SystemHelpBlock.php
index 70b2098..735391e 100644
--- a/core/modules/system/src/Plugin/Block/SystemHelpBlock.php
+++ b/core/modules/help/src/Plugin/Block/SystemHelpBlock.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\system\Plugin\Block\SystemHelpBlock.
+ * Contains \Drupal\help\Plugin\Block\SystemHelpBlock.
  */
 
-namespace Drupal\system\Plugin\Block;
+namespace Drupal\help\Plugin\Block;
 
 use Drupal\Core\Block\BlockBase;
 use Drupal\Core\Extension\ModuleHandlerInterface;
diff --git a/core/modules/node/src/Tests/NodeTranslationUITest.php b/core/modules/node/src/Tests/NodeTranslationUITest.php
index cb5ffe3..08c3503 100644
--- a/core/modules/node/src/Tests/NodeTranslationUITest.php
+++ b/core/modules/node/src/Tests/NodeTranslationUITest.php
@@ -23,7 +23,7 @@ class NodeTranslationUITest extends ContentTranslationUITest {
    *
    * @var array
    */
-  public static $modules = array('block', 'language', 'content_translation', 'node', 'datetime', 'field_ui');
+  public static $modules = array('block', 'language', 'content_translation', 'node', 'datetime', 'field_ui', 'help');
 
   /**
    * The profile to install as a basis for testing.
diff --git a/core/modules/system/system.module b/core/modules/system/system.module
index 4eaf7bb..8782d8f 100644
--- a/core/modules/system/system.module
+++ b/core/modules/system/system.module
@@ -720,10 +720,6 @@ function system_preprocess_block(&$variables) {
     case 'system_powered_by_block':
       $variables['attributes']['role'] = 'complementary';
       break;
-
-    case 'system_help_block':
-      $variables['attributes']['role'] = 'complementary';
-      break;
   }
 }
 
@@ -1293,15 +1289,6 @@ function system_block_view_system_main_block_alter(array &$build, BlockPluginInt
 }
 
 /**
- * Implements hook_block_view_BASE_BLOCK_ID_alter().
- */
-function system_block_view_system_help_block_alter(array &$build, BlockPluginInterface $block) {
-  // Assume that most users do not need or want to perform contextual actions on
-  // the help block, so don't needlessly draw attention to it.
-  unset($build['#contextual_links']);
-}
-
-/**
  * Implements hook_path_update().
  */
 function system_path_update() {
diff --git a/core/profiles/standard/config/install/block.block.bartik_help.yml b/core/profiles/standard/config/install/block.block.bartik_help.yml
index 941fa1b..1852b66 100644
--- a/core/profiles/standard/config/install/block.block.bartik_help.yml
+++ b/core/profiles/standard/config/install/block.block.bartik_help.yml
@@ -8,11 +8,11 @@ plugin: system_help_block
 settings:
   id: system_help_block
   label: 'System Help'
-  provider: system
+  provider: help
   label_display: '0'
 dependencies:
   module:
-    - system
+    - help
   theme:
     - bartik
 visibility: {  }
diff --git a/core/profiles/standard/config/install/block.block.seven_help.yml b/core/profiles/standard/config/install/block.block.seven_help.yml
index 168e7f0..1ff9a44 100644
--- a/core/profiles/standard/config/install/block.block.seven_help.yml
+++ b/core/profiles/standard/config/install/block.block.seven_help.yml
@@ -8,11 +8,11 @@ plugin: system_help_block
 settings:
   id: system_help_block
   label: 'System Help'
-  provider: system
+  provider: help
   label_display: '0'
 dependencies:
   module:
-    - system
+    - help
   theme:
     - seven
 visibility: {  }