diff --git a/src/backend/utils/time/snapmgr.c b/src/backend/utils/time/snapmgr.c
index 477aa6b6758e86c11b2aae693ba989b758d7100c..5c29a11c0b458e82b0fddc5b0b7fba0393c9ee0e 100644
--- a/src/backend/utils/time/snapmgr.c
+++ b/src/backend/utils/time/snapmgr.c
@@ -295,20 +295,7 @@ GetCatalogSnapshot(Oid relid)
 	if (HistoricSnapshotActive())
 		return HistoricSnapshot;
 
-	/*
-	 * GPDB_94_MERGE_FIXME: This is typically the way SnapshotNow was.
-	 * I think it makes sense to use a local snapshot for this.. But
-	 * update comments, and verify all the places where this is used.
-	 * Also, do we need a TRY-CATCH block to reset DistributedTransactionContext
-	 * on error?
-	 */
-	DtxContext		saveDistributedTransactionContext = DistributedTransactionContext;
-	DistributedTransactionContext = DTX_CONTEXT_LOCAL_ONLY;
-
-	Snapshot snapshot = GetNonHistoricCatalogSnapshot(relid, DistributedTransactionContext);
-
-	DistributedTransactionContext = saveDistributedTransactionContext;
-	return snapshot;
+	return GetNonHistoricCatalogSnapshot(relid, DTX_CONTEXT_LOCAL_ONLY);
 }
 
 /*