diff --git a/src/backend/cdb/cdbgroup.c b/src/backend/cdb/cdbgroup.c
index 1d2fe20670a4a9e1ebb1159d3ffe5a4b5f0c94d9..eb17ed645622190234ebc5307efe433cf3e259b2 100644
--- a/src/backend/cdb/cdbgroup.c
+++ b/src/backend/cdb/cdbgroup.c
@@ -4579,13 +4579,8 @@ add_second_stage_agg(PlannerInfo *root,
 
 	/*
 	 * Since the rtable has changed, we had better recreate a RelOptInfo entry
-	 * for it. Make a copy of the groupClause since freeing the arrays can
-	 * pull out references still in use from underneath it.
-	 * We do not free root->simple_rel_array and root->simple_rte_array since
-	 * they are used by subroot.
-	 * GPDB_92_MERGE_FIXME: Do we still need to copy groupClause?
+	 * for it.
 	 */
-	root->parse->groupClause = copyObject(root->parse->groupClause);
 	rebuild_simple_rel_and_rte(root);
 
 	/*