From 7e543c21aeb0780ab79e80ee1530a7e2977ec301 Mon Sep 17 00:00:00 2001
From: Tom Robinson <tlrobinson@gmail.com>
Date: Fri, 9 Dec 2016 00:54:58 -0800
Subject: [PATCH] Don't try to convert 'rows' to custom expression...again

---
 .../metabase/query_builder/components/AggregationPopover.jsx    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/metabase/query_builder/components/AggregationPopover.jsx b/frontend/src/metabase/query_builder/components/AggregationPopover.jsx
index 0c70e8f8ac7..5e87cfd77d2 100644
--- a/frontend/src/metabase/query_builder/components/AggregationPopover.jsx
+++ b/frontend/src/metabase/query_builder/components/AggregationPopover.jsx
@@ -225,7 +225,7 @@ export default class AggregationPopover extends Component {
                         if (index === customExpressionIndex) {
                             this.onPickAggregation({
                                 custom: true,
-                                value: aggregation
+                                value: aggregation !== "rows" && !_.isEqual(aggregation, ["rows"]) ? aggregation : null
                             })
                         }
                     }}
-- 
GitLab