diff --git a/src/backend/distributed/executor/adaptive_executor.c b/src/backend/distributed/executor/adaptive_executor.c
index d88b4beda..93258fe4c 100644
--- a/src/backend/distributed/executor/adaptive_executor.c
+++ b/src/backend/distributed/executor/adaptive_executor.c
@@ -852,8 +852,8 @@ AdaptiveExecutor(CitusScanState *scanState)
 	 */
 	if (paramListInfo && !paramListInfo->paramFetch)
 	{
-		paramListInfo = copyParamList(paramListInfo);
-		MarkUnreferencedExternParams((Node *) job->jobQuery, paramListInfo);
+		//paramListInfo = copyParamList(paramListInfo);
+		//MarkUnreferencedExternParams((Node *) job->jobQuery, paramListInfo);
 	}
 
 	DistributedExecution *execution = CreateDistributedExecution(
diff --git a/src/backend/distributed/executor/citus_custom_scan.c b/src/backend/distributed/executor/citus_custom_scan.c
index c83892b3e..185e7f48b 100644
--- a/src/backend/distributed/executor/citus_custom_scan.c
+++ b/src/backend/distributed/executor/citus_custom_scan.c
@@ -333,7 +333,7 @@ CitusBeginReadOnlyScan(CustomScanState *node, EState *estate, int eflags)
 		SetTaskQueryString(task, fastPathPlanCache->queryString);
 
 		/* TODO: we have this due to MarkUnreferencedExternParams. Can we find another way? */
-		workerJob->jobQuery = copyObject(originalDistributedPlan->workerJob->jobQuery);
+		//workerJob->jobQuery = copyObject(originalDistributedPlan->workerJob->jobQuery);
 	}
 }