2 files changed, 1 insertions, 14 deletions
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/GroupingRequest.java b/container-search/src/main/java/com/yahoo/search/grouping/GroupingRequest.java
index 5b97a80c4ff..b023166fe9e 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/GroupingRequest.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/GroupingRequest.java
@@ -133,10 +133,6 @@ public class GroupingRequest {
      */
     public static GroupingRequest newInstance(Query query) {
         List<GroupingRequest> lst = getRequests(query);
-        if (lst.isEmpty()) {
-            lst = new LinkedList<>();
-            query.getSelect().setGrouping(lst);
-        }
         GroupingRequest ret = new GroupingRequest(lst.size());
         lst.add(ret);
         return ret;
diff --git a/container-search/src/main/java/com/yahoo/search/query/Select.java b/container-search/src/main/java/com/yahoo/search/query/Select.java
index db3ce811b63..ef6a7fe8272 100644
--- a/container-search/src/main/java/com/yahoo/search/query/Select.java
+++ b/container-search/src/main/java/com/yahoo/search/query/Select.java
@@ -107,19 +107,10 @@ public class Select implements Cloneable {
     }
 
 
-    /** Returns the query's {@link GroupingRequest} objects */
+    /** Returns the query's {@link GroupingRequest} objects, as mutable list */
     public List<GroupingRequest> getGrouping(){ return groupingRequests; }
 
 
-    /** Set the query's list of {@link GroupingRequest} objects */
-    public void setGrouping(List<GroupingRequest> lst){
-        if (lst == null) {
-            lst = Collections.emptyList();
-        }
-        this.groupingRequests = lst;
-    }
-
-
     @Override
     public String toString() {
         return "where: [" + where + "], grouping: [" + grouping+ "]";