diff --git a/core/modules/search/lib/Drupal/search/Plugin/views/argument/Search.php b/core/modules/search/lib/Drupal/search/Plugin/views/argument/Search.php
index 0f4f4b5..a0de754 100644
--- a/core/modules/search/lib/Drupal/search/Plugin/views/argument/Search.php
+++ b/core/modules/search/lib/Drupal/search/Plugin/views/argument/Search.php
@@ -103,7 +103,7 @@ public function query($group_by = FALSE) {
       }
 
       $this->query->add_where(0, $search_condition);
-      $this->query->add_groupby("$search_index.sid");
+      $this->query->addGroupby("$search_index.sid");
       $matches = $this->search_query->matches();
       $placeholder = $this->placeholder();
       $this->query->add_having_expression(0, "COUNT(*) >= $placeholder", array($placeholder => $matches));
diff --git a/core/modules/search/lib/Drupal/search/Plugin/views/filter/Search.php b/core/modules/search/lib/Drupal/search/Plugin/views/filter/Search.php
index afb7724..b3f7da8 100644
--- a/core/modules/search/lib/Drupal/search/Plugin/views/filter/Search.php
+++ b/core/modules/search/lib/Drupal/search/Plugin/views/filter/Search.php
@@ -183,7 +183,7 @@ public function query() {
       }
 
       $this->query->add_where($this->options['group'], $search_condition);
-      $this->query->add_groupby("$search_index.sid");
+      $this->query->addGroupby("$search_index.sid");
       $matches = $this->search_query->matches();
       $placeholder = $this->placeholder();
       $this->query->add_having_expression($this->options['group'], "COUNT(*) >= $placeholder", array($placeholder => $matches));
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument/ArgumentPluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/argument/ArgumentPluginBase.php
index 117ade9..7831349 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/argument/ArgumentPluginBase.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/argument/ArgumentPluginBase.php
@@ -795,7 +795,7 @@ function default_summary() {
    * Build the info for the summary query.
    *
    * This must:
-   * - add_groupby: group on this field in order to create summaries.
+   * - addGroupby: group on this field in order to create summaries.
    * - add_field: add a 'num_nodes' field for the count. Usually it will
    *   be a count on $view->base_field
    * - set_count_field: Reset the count field so we get the right paging.
@@ -856,7 +856,7 @@ function summary_basics($count_field = TRUE) {
     $distinct = ($this->view->display_handler->getOption('distinct') && empty($this->query->no_distinct));
 
     $count_alias = $this->query->add_field($this->view->storage->get('base_table'), $this->view->storage->get('base_field'), 'num_records', array('count' => TRUE, 'distinct' => $distinct));
-    $this->query->add_groupby($this->name_alias);
+    $this->query->addGroupby($this->name_alias);
 
     if ($count_field) {
       $this->query->set_count_field($this->tableAlias, $this->realField);
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/query/Sql.php b/core/modules/views/lib/Drupal/views/Plugin/views/query/Sql.php
index 3f7c8bd..b62a5d9 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/query/Sql.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/query/Sql.php
@@ -1034,7 +1034,7 @@ function add_orderby($table, $field = NULL, $order = 'ASC', $alias = '', $params
    * for ensuring that the fields are fully qualified and the table is properly
    * added.
    */
-  function add_groupby($clause) {
+  public function addGroupby($clause) {
     // Only add it if it's not already in there.
     if (!in_array($clause, $this->groupby)) {
       $this->groupby[] = $clause;
@@ -1243,7 +1243,7 @@ public function query($get_count = FALSE) {
     // Check query distinct value.
     if (empty($this->no_distinct) && $this->distinct && !empty($this->fields)) {
       $base_field_alias = $this->add_field($this->view->storage->get('base_table'), $this->view->storage->get('base_field'));
-      $this->add_groupby($base_field_alias);
+      $this->addGroupby($base_field_alias);
       $distinct = TRUE;
     }