diff --git a/core/modules/comment/src/Tests/CommentFieldsTest.php b/core/modules/comment/src/Tests/CommentFieldsTest.php
index 017f3fb..a0cb95d 100644
--- a/core/modules/comment/src/Tests/CommentFieldsTest.php
+++ b/core/modules/comment/src/Tests/CommentFieldsTest.php
@@ -63,29 +63,6 @@ function testCommentDefaultFields() {
   }
 
   /**
-   * Tests that you can remove a comment field.
-   */
-  public function testCommentFieldDelete() {
-    $this->drupalCreateContentType(array('type' => 'test_node_type'));
-    $this->container->get('comment.manager')->addDefaultField('node', 'test_node_type');
-    // We want to test the handling of removing the primary comment field, so we
-    // ensure there is at least one other comment field attached to a node type
-    // so that comment_entity_load() runs for nodes.
-    $this->container->get('comment.manager')->addDefaultField('node', 'test_node_type', 'comment2');
-
-    // Create a sample node.
-    $node = $this->drupalCreateNode(array(
-      'title' => 'Baloney',
-      'type' => 'test_node_type',
-    ));
-
-    // Delete the first comment field.
-    FieldStorageConfig::loadByName('node', 'comment')->delete();
-    $this->drupalGet('node/' . $node->nid->value);
-    $this->assertResponse(200);
-  }
-
-  /**
    * Tests that comment module works when installed after a content module.
    */
   function testCommentInstallAfterContentModule() {
diff --git a/core/modules/forum/forum.module b/core/modules/forum/forum.module
index 31acb77..c117e61 100644
--- a/core/modules/forum/forum.module
+++ b/core/modules/forum/forum.module
@@ -735,8 +735,7 @@ function template_preprocess_forum_submitted(&$variables) {
  * or there are any terms in the forum vocabulary.
  */
 function forum_system_info_alter(&$info, Extension $file, $type) {
-  // It is not safe to call entity_load_multiple_by_properties() during
-  // maintenance mode.
+  // It is not safe use the entity query service during maintenance mode.
   if ($type == 'module' && !defined('MAINTENANCE_MODE') && $file->getName() == 'forum') {
     $factory = \Drupal::service('entity.query');
     $nodes = $factory->get('node')