19,21d18
<   if (is_array($query->extra['views_groupby_fields_to_aggregate'])) {
<     $query->groupby=array_diff($query->groupby,$query->extra['views_groupby_fields_to_aggregate']);
<   }