diff --git a/src/backend/distributed/planner/distributed_planner.c b/src/backend/distributed/planner/distributed_planner.c
index 585f09b76..6304cf370 100644
--- a/src/backend/distributed/planner/distributed_planner.c
+++ b/src/backend/distributed/planner/distributed_planner.c
@@ -225,6 +225,7 @@ distributed_planner(Query *parse, int cursorOptions, ParamListInfo boundParams)
 			planContext.convertedQuery = ConvertToInsertSelect(parse);
 
 			planContext.originalQuery = GetSingleValue(planContext.convertedQuery);
+			planContext.query = planContext.originalQuery;
 		}
 		else
 		{
@@ -269,11 +270,6 @@ distributed_planner(Query *parse, int cursorOptions, ParamListInfo boundParams)
 			 * postgres' planner.
 			 */
 
-//			RangeTblEntry *subqueryRte = ExtractSelectRangeTableEntry(planContext.originalQuery);
-//					subqueryRte = linitial(subqueryRte->subquery->rtable);
-//					RangeTblEntry *valuesRte = linitial(subqueryRte->subquery->rtable);
-//					elog(INFO, "valuesRte: %d len: %d",valuesRte->rtekind, list_length(valuesRte->values_lists));
-
 
 			planContext.plan = standard_planner(planContext.query,
 												planContext.cursorOptions,