diff --git a/Calorimeter/CaloDigiAlgs/python/CaloDigiAlgsConfig.py b/Calorimeter/CaloDigiAlgs/python/CaloDigiAlgsConfig.py
index 4f5693bd7888853e3bee6668e9f0323296f2dfc7..277c7e6fb6c5faa17fdc609f88eb0e5ca23134ae 100644
--- a/Calorimeter/CaloDigiAlgs/python/CaloDigiAlgsConfig.py
+++ b/Calorimeter/CaloDigiAlgs/python/CaloDigiAlgsConfig.py
@@ -5,7 +5,7 @@ from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
 
 
 # One stop shopping for normal FASER data
-def CaloWaveformDigitizationCfg(flags, naive = False):
+def CaloWaveformDigitizationCfg(flags):
     """ Return all algorithms and tools for Waveform digitization """
     acc = ComponentAccumulator()
 
diff --git a/Scintillator/ScintDigiAlgs/python/ScintDigiAlgsConfig.py b/Scintillator/ScintDigiAlgs/python/ScintDigiAlgsConfig.py
index ff9e95e363215602fa90477e60019a2454a7aa6d..70442751102a4bca8667603e3dc449e7be74bce1 100644
--- a/Scintillator/ScintDigiAlgs/python/ScintDigiAlgsConfig.py
+++ b/Scintillator/ScintDigiAlgs/python/ScintDigiAlgsConfig.py
@@ -5,7 +5,7 @@ from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
 
 
 # One stop shopping for normal FASER data
-def ScintWaveformDigitizationCfg(flags, naive = False):
+def ScintWaveformDigitizationCfg(flags):
     """ Return all algorithms and tools for Waveform digitization """
     acc = ComponentAccumulator()
 
diff --git a/Waveform/WaveRecAlgs/python/WaveRecAlgsConfig.py b/Waveform/WaveRecAlgs/python/WaveRecAlgsConfig.py
index c4acec4bd4fe3c6fedc17e9c8a4c681f0c83f476..5e8460dbae47d8c2d086fb0aa1d593b0fdc17400 100644
--- a/Waveform/WaveRecAlgs/python/WaveRecAlgsConfig.py
+++ b/Waveform/WaveRecAlgs/python/WaveRecAlgsConfig.py
@@ -11,7 +11,7 @@ WaveformReconstructionTool = CompFactory.WaveformReconstructionTool
 ClockReconstructionTool = CompFactory.ClockReconstructionTool
 
 # One stop shopping for normal FASER data
-def WaveformReconstructionCfg(flags, naive = True):
+def WaveformReconstructionCfg(flags, naive = False):
     """ Return all algorithms and tools for Waveform reconstruction """
     acc = ComponentAccumulator()