diff --git a/dbcon/mysql/ha_mcs_execplan.cpp b/dbcon/mysql/ha_mcs_execplan.cpp
index b64e85e42..227b80a3b 100755
--- a/dbcon/mysql/ha_mcs_execplan.cpp
+++ b/dbcon/mysql/ha_mcs_execplan.cpp
@@ -4564,10 +4564,9 @@ ReturnedColumn* buildAggregateColumn(Item* item, gp_walk_info& gwi)
     if (gwi.clauseType == SELECT)
         gwi.aggOnSelect = true;
 
-    // N.B. argument_count() is the # of formal parms to the agg fcn. InifniDB only supports 1 argument
-    // TODO: Support more than one parm
-#if 0
-
+    // Argument_count() is the # of formal parms to the agg fcn. Columnstore
+    // only supports 1 argument except UDAnF and GROUP_CONCAT
+    // TODO: Support more than one parm for COUNT(DISTINCT)
     if (isp->argument_count() != 1 && isp->sum_func() != Item_sum::GROUP_CONCAT_FUNC
             && isp->sum_func() != Item_sum::UDF_SUM_FUNC)
     {
@@ -4576,7 +4575,6 @@ ReturnedColumn* buildAggregateColumn(Item* item, gp_walk_info& gwi)
         return NULL;
     }
 
-#endif
     AggregateColumn* ac = NULL;
 
     if (isp->sum_func() == Item_sum::GROUP_CONCAT_FUNC)