diff --git a/SimTracker/TrackerHitAssociation/python/tpClusterProducer_cfi.py b/SimTracker/TrackerHitAssociation/python/tpClusterProducer_cfi.py
index e8330c074dfac..a8de0a96e4678 100644
--- a/SimTracker/TrackerHitAssociation/python/tpClusterProducer_cfi.py
+++ b/SimTracker/TrackerHitAssociation/python/tpClusterProducer_cfi.py
@@ -1,5 +1,4 @@
 import FWCore.ParameterSet.Config as cms
-from Configuration.ProcessModifiers.gpu_cff import gpu
 
 from SimTracker.TrackerHitAssociation.tpClusterProducerDefault_cfi import tpClusterProducerDefault as _tpClusterProducerDefault
 
@@ -25,6 +24,5 @@
 tpClusterProducerHeterogeneous = _tpClusterProducerHeterogeneous.clone()
 
 from SimTracker.TrackerHitAssociation.tpClusterHeterogeneousConverter_cfi import tpClusterHeterogeneousConverter as _tpHeterogeneousConverter
-
-gpu.toReplaceWith(tpClusterProducer, _tpHeterogeneousConverter.clone())
+tpClusterProducerConverter = _tpHeterogeneousConverter.clone()
 
diff --git a/Validation/RecoTrack/python/TrackValidation_cff.py b/Validation/RecoTrack/python/TrackValidation_cff.py
index dff571862bb46..5a806298bb7b3 100644
--- a/Validation/RecoTrack/python/TrackValidation_cff.py
+++ b/Validation/RecoTrack/python/TrackValidation_cff.py
@@ -713,9 +713,13 @@ def _uniqueFirstLayers(layerList):
 tpClusterProducerHeterogeneousPixelTrackingOnly = tpClusterProducerHeterogeneous.clone(
    pixelClusterSrc = "siPixelClustersPreSplitting"
 )
-tpClusterProducerPixelTrackingOnly = tpClusterProducer.clone()
-# Need to use the modifier to customize because the exact EDProducer type depends on the modifier
-gpu.toModify(tpClusterProducerPixelTrackingOnly, src = "tpClusterProducerHeterogeneousPixelTrackingOnly")
+tpClusterProducerPixelTrackingOnly = tpClusterProducer.clone(
+   pixelClusterSrc = "siPixelClustersPreSplitting"
+)
+from Configuration.ProcessModifiers.gpu_cff import gpu
+gpu.toReplaceWith(tpClusterProducerPixelTrackingOnly, tpClusterProducerConverter.clone(
+    src = "tpClusterProducerHeterogeneousPixelTrackingOnly"
+))
 
 quickTrackAssociatorByHitsPixelTrackingOnly = quickTrackAssociatorByHits.clone(
     cluster2TPSrc = "tpClusterProducerPixelTrackingOnly"