diff --git a/src/backend/distributed/planner/multi_physical_planner.c b/src/backend/distributed/planner/multi_physical_planner.c
index f909b48ce..4f8ee6a2c 100644
--- a/src/backend/distributed/planner/multi_physical_planner.c
+++ b/src/backend/distributed/planner/multi_physical_planner.c
@@ -316,11 +316,6 @@ BuildJobTree(MultiTreeRoot *multiTree)
 				boundaryNodeJobType = JOIN_MAP_MERGE_JOB;
 			}
 		}
-		else if (currentNodeType == T_MultiPartition &&
-				 parentNodeType == T_MultiExtendedOp)
-		{
-			boundaryNodeJobType = SUBQUERY_MAP_MERGE_JOB;
-		}
 		else if (currentNodeType == T_MultiCollect &&
 				 parentNodeType != T_MultiPartition)
 		{
@@ -1954,10 +1949,7 @@ BuildMapMergeJob(Query *jobQuery, List *dependentJobList, Var *partitionKey,
 	Var *partitionColumn = copyObject(partitionKey);
 
 	/* update the logical partition key's table and column identifiers */
-	if (boundaryNodeJobType != SUBQUERY_MAP_MERGE_JOB)
-	{
-		UpdateColumnAttributes(partitionColumn, rangeTableList, dependentJobList);
-	}
+	UpdateColumnAttributes(partitionColumn, rangeTableList, dependentJobList);
 
 	MapMergeJob *mapMergeJob = CitusMakeNode(MapMergeJob);
 	mapMergeJob->job.jobId = UniqueJobId();
diff --git a/src/include/distributed/multi_physical_planner.h b/src/include/distributed/multi_physical_planner.h
index a20085958..920541e97 100644
--- a/src/include/distributed/multi_physical_planner.h
+++ b/src/include/distributed/multi_physical_planner.h
@@ -95,8 +95,7 @@ typedef enum
 {
 	JOB_INVALID_FIRST = 0,
 	JOIN_MAP_MERGE_JOB = 1,
-	SUBQUERY_MAP_MERGE_JOB = 2,
-	TOP_LEVEL_WORKER_JOB = 3
+	TOP_LEVEL_WORKER_JOB = 2
 } BoundaryNodeJobType;