diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/share/AthenaPoolTestWrite.py b/AtlasTest/DatabaseTest/AthenaPoolTest/share/AthenaPoolTestWrite.py
index 6c2472465406e4b2f49461b9e8a6adce66d420c3..5fc8b48b3395a2facecf65c497c31ae23a4c8dfd 100755
--- a/AtlasTest/DatabaseTest/AthenaPoolTest/share/AthenaPoolTestWrite.py
+++ b/AtlasTest/DatabaseTest/AthenaPoolTest/share/AthenaPoolTestWrite.py
@@ -13,10 +13,6 @@
 ## basic job configuration (for generator)
 import AthenaCommon.AtlasUnixGeneratorJob
 
-# Set handler for traceback
-gbl.AthenaServices.SetFatalHandler(438)
-
-
 ## get a handle to the default top-level algorithm sequence
 from AthenaCommon.AlgSequence import AlgSequence
 topSequence = AlgSequence()
@@ -27,6 +23,9 @@ from AthenaCommon.AppMgr import ServiceMgr as svcMgr
 ## get a handle to the ApplicationManager
 from AthenaCommon.AppMgr import theApp
 
+# Set handler for traceback
+svcMgr.CoreDumpSvc.FatalHandler = 438
+
 #--------------------------------------------------------------
 # Load POOL support
 #--------------------------------------------------------------
diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/share/EventInfoWrite.py b/AtlasTest/DatabaseTest/AthenaPoolTest/share/EventInfoWrite.py
index af7bd07c828aaf2211d6c15cfcd5dd915a84847a..4efa3fc4e2a70824c9503337e8f554ed81a1c789 100755
--- a/AtlasTest/DatabaseTest/AthenaPoolTest/share/EventInfoWrite.py
+++ b/AtlasTest/DatabaseTest/AthenaPoolTest/share/EventInfoWrite.py
@@ -13,10 +13,6 @@
 ## basic job configuration (for generator)
 import AthenaCommon.AtlasUnixGeneratorJob
 
-# Set handler for traceback
-#gbl.AthenaServices.SetFatalHandler(438)
-
-
 ## get a handle to the default top-level algorithm sequence
 from AthenaCommon.AlgSequence import AlgSequence
 topSequence = AlgSequence()
diff --git a/AtlasTest/DatabaseTest/IOVDbTestAlg/share/AllReadCool.py b/AtlasTest/DatabaseTest/IOVDbTestAlg/share/AllReadCool.py
index acf11bd900242def1836fd56f562eb4b164df466..978e94b7686524b5af6ecab6023c52b5326f6249 100755
--- a/AtlasTest/DatabaseTest/IOVDbTestAlg/share/AllReadCool.py
+++ b/AtlasTest/DatabaseTest/IOVDbTestAlg/share/AllReadCool.py
@@ -7,9 +7,6 @@
 ## basic job configuration (for generator)
 import AthenaCommon.AtlasUnixGeneratorJob
 
-# Set handler for traceback
-#gbl.AthenaServices.SetFatalHandler(438)
-
 #import password for devdb10 from devdb10pwd.py
 from devdb10_pwd import devdb10pwd
 
diff --git a/AtlasTest/DatabaseTest/IOVDbTestAlg/share/AllWriteCool.py b/AtlasTest/DatabaseTest/IOVDbTestAlg/share/AllWriteCool.py
index 282f4cd98d04689f1d7da46effb96b4b130881ab..4a38dbff0a526af4914183dd3753998e12e1ff8a 100755
--- a/AtlasTest/DatabaseTest/IOVDbTestAlg/share/AllWriteCool.py
+++ b/AtlasTest/DatabaseTest/IOVDbTestAlg/share/AllWriteCool.py
@@ -1,5 +1,4 @@
 import AthenaCommon.AtlasUnixGeneratorJob
-gbl.AthenaServices.SetFatalHandler(438)
 from AthenaCommon.AlgSequence import AlgSequence
 topSequence = AlgSequence()
 from AthenaCommon.AppMgr import ServiceMgr as svcMgr
@@ -10,6 +9,8 @@ from devdb10_pwd import devdb10pwd
 
 import IOVDbSvc.IOVDb
 
+svcMgr.CoreDumpSvc.FatalHandler = 438
+
 from IOVDbTestAlg.IOVDbTestAlgConf import IOVDbTestAlg
 topSequence += IOVDbTestAlg( "IOVDbTestAlg" )
 
diff --git a/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgReadCool.py b/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgReadCool.py
index 0f988a2ba809b81fadbe78d918c397fef5d90400..cc9e6a4da2603e212990391c421a64915843a39c 100755
--- a/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgReadCool.py
+++ b/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgReadCool.py
@@ -7,9 +7,6 @@
 ## basic job configuration (for generator)
 import AthenaCommon.AtlasUnixGeneratorJob
 
-# Set handler for traceback
-#gbl.AthenaServices.SetFatalHandler(438)
-
 ## get a handle to the default top-level algorithm sequence
 from AthenaCommon.AlgSequence import AlgSequence
 topSequence = AlgSequence()
diff --git a/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgReadCoolAfterTwoStep.py b/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgReadCoolAfterTwoStep.py
index 5e65fb0af50f7bfd24e815ee1ef6faba6c41c3fe..91f6f2725338c5db45d718b301c36e3c4e34eb7c 100755
--- a/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgReadCoolAfterTwoStep.py
+++ b/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgReadCoolAfterTwoStep.py
@@ -6,9 +6,6 @@
 ## basic job configuration (for generator)
 import AthenaCommon.AtlasUnixGeneratorJob
 
-# Set handler for traceback
-#gbl.AthenaServices.SetFatalHandler(438)
-
 ## get a handle to the default top-level algorithm sequence
 from AthenaCommon.AlgSequence import AlgSequence
 topSequence = AlgSequence()
diff --git a/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgReadCoolAndReg.py b/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgReadCoolAndReg.py
index d0d1372a0c840ead36160d20be2b518300ed302a..512575927b3559dca9f4a45e5ca32fbb92821e54 100755
--- a/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgReadCoolAndReg.py
+++ b/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgReadCoolAndReg.py
@@ -7,9 +7,6 @@
 ## basic job configuration (for generator)
 import AthenaCommon.AtlasUnixGeneratorJob
 
-# Set handler for traceback
-#gbl.AthenaServices.SetFatalHandler(438)
-
 ## get a handle to the default top-level algorithm sequence
 from AthenaCommon.AlgSequence import AlgSequence
 topSequence = AlgSequence()
diff --git a/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgReadCoolFromMetaData.py b/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgReadCoolFromMetaData.py
index 51194796060552be9ae40720346b1174cc19d08b..f1328760141e9ba628447b3e8c8cb30d5bfbf5bf 100644
--- a/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgReadCoolFromMetaData.py
+++ b/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgReadCoolFromMetaData.py
@@ -6,9 +6,6 @@
 ## basic job configuration
 import AthenaCommon.AtlasUnixStandardJob
 
-# Set handler for traceback
-gbl.AthenaServices.SetFatalHandler(438)
-
 ## get a handle on the default top-level algorithm sequence
 from AthenaCommon.AlgSequence import AlgSequence
 topSequence = AlgSequence()
@@ -31,6 +28,9 @@ from AthenaCommon.AppMgr import ServiceMgr as svcMgr
 ## get a handle on the ToolSvc
 from AthenaCommon.AppMgr import ToolSvc
 
+# Set handler for traceback
+svcMgr.CoreDumpSvc.FatalHandler = 438
+
 #svcMgr.EventSelector.InputCollections = [ "SimplePoolFile1.root" ]
 svcMgr.EventSelector.InputCollections = [ "SimpleEventPoolFile.root" ]
 
diff --git a/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgReadCoolNewTag.py b/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgReadCoolNewTag.py
index 8e88b4f9e965038174620c28a71805f193740b14..c42d7927035149eb0ae9dca198792ba599a5f2df 100644
--- a/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgReadCoolNewTag.py
+++ b/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgReadCoolNewTag.py
@@ -7,9 +7,6 @@
 ## basic job configuration (for generator)
 import AthenaCommon.AtlasUnixGeneratorJob
 
-# Set handler for traceback
-#gbl.AthenaServices.SetFatalHandler(438)
-
 ## get a handle to the default top-level algorithm sequence
 from AthenaCommon.AlgSequence import AlgSequence
 topSequence = AlgSequence()
diff --git a/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgReadCoolNoReg.py b/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgReadCoolNoReg.py
index a13ba7d6fcc026ab78e763d94b18fb7e25dfefad..cc5d7d3a317aefd01d0b56f94b78f1cc13afcb5c 100755
--- a/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgReadCoolNoReg.py
+++ b/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgReadCoolNoReg.py
@@ -7,10 +7,6 @@
 ## basic job configuration (for generator)
 import AthenaCommon.AtlasUnixGeneratorJob
 
-# Set handler for traceback
-#gbl.AthenaServices.SetFatalHandler(438)
-
-
 ## get a handle to the default top-level algorithm sequence
 from AthenaCommon.AlgSequence import AlgSequence
 topSequence = AlgSequence()
diff --git a/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgReadCoolWriteMD.py b/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgReadCoolWriteMD.py
index c60f585d421c8fd2c991f6089c02fc0683757a34..bec0bb629a3c8b085d54ace3f9ef084226342097 100644
--- a/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgReadCoolWriteMD.py
+++ b/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgReadCoolWriteMD.py
@@ -7,9 +7,6 @@
 ## basic job configuration (for generator)
 import AthenaCommon.AtlasUnixGeneratorJob
 
-# Set handler for traceback
-#gbl.AthenaServices.SetFatalHandler(438)
-
 ## get a handle to the default top-level algorithm sequence
 from AthenaCommon.AlgSequence import AlgSequence
 topSequence = AlgSequence()
diff --git a/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgWriteCool.py b/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgWriteCool.py
index fa7b4746d407d131110e5ccc4c937ab13f18e89e..5a2911b776f2ebcd6f52da5f55afeca616ac42d3 100755
--- a/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgWriteCool.py
+++ b/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgWriteCool.py
@@ -7,9 +7,6 @@
 ## basic job configuration (for generator)
 import AthenaCommon.AtlasUnixGeneratorJob
 
-# Set handler for traceback
-#gbl.AthenaServices.SetFatalHandler(438)
-
 ## get a handle to the default top-level algorithm sequence
 from AthenaCommon.AlgSequence import AlgSequence
 topSequence = AlgSequence()
diff --git a/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgWriteCoolNewTag.py b/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgWriteCoolNewTag.py
index 18e6b225a31108ae336ed8125d336c3876dadf9a..cd6fdbdd2746174893e8cf6d0de841c6f96ce88e 100644
--- a/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgWriteCoolNewTag.py
+++ b/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgWriteCoolNewTag.py
@@ -7,9 +7,6 @@
 ## basic job configuration (for generator)
 import AthenaCommon.AtlasUnixGeneratorJob
 
-# Set handler for traceback
-#gbl.AthenaServices.SetFatalHandler(438)
-
 ## get a handle to the default top-level algorithm sequence
 from AthenaCommon.AlgSequence import AlgSequence
 topSequence = AlgSequence()
diff --git a/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgWriteCoolNoReg.py b/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgWriteCoolNoReg.py
index 0329d150b13f0e41aefe652af4e21c307bb1bc67..06ad40ade26d6f89b3f1df847e002c8a36a92033 100755
--- a/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgWriteCoolNoReg.py
+++ b/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgWriteCoolNoReg.py
@@ -7,10 +7,6 @@
 ## basic job configuration (for generator)
 import AthenaCommon.AtlasUnixGeneratorJob
 
-# Set handler for traceback
-#gbl.AthenaServices.SetFatalHandler(438)
-
-
 ## get a handle to the default top-level algorithm sequence
 from AthenaCommon.AlgSequence import AlgSequence
 topSequence = AlgSequence()
diff --git a/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgWriteCoolStep2.py b/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgWriteCoolStep2.py
index 42b834a9f0cc36c3f340ab0416f424a750ae078e..8d3508f7defc2524ddb28ffca8da20abf3d6e520 100755
--- a/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgWriteCoolStep2.py
+++ b/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgWriteCoolStep2.py
@@ -7,9 +7,6 @@
 ## basic job configuration (for generator)
 import AthenaCommon.AtlasUnixGeneratorJob
 
-# Set handler for traceback
-#gbl.AthenaServices.SetFatalHandler(438)
-
 ## get a handle to the default top-level algorithm sequence
 from AthenaCommon.AlgSequence import AlgSequence
 topSequence = AlgSequence()
diff --git a/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgWriteCoolStep3.py b/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgWriteCoolStep3.py
index 872b368e51ce1771f126d58c10943493acd40ad6..f2baa7693604dca4d4a44b3e6e4fed97d897cced 100755
--- a/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgWriteCoolStep3.py
+++ b/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgWriteCoolStep3.py
@@ -7,9 +7,6 @@
 ## basic job configuration (for generator)
 import AthenaCommon.AtlasUnixGeneratorJob
 
-# Set handler for traceback
-#gbl.AthenaServices.SetFatalHandler(438)
-
 ## get a handle to the default top-level algorithm sequence
 from AthenaCommon.AlgSequence import AlgSequence
 topSequence = AlgSequence()
diff --git a/Control/AthenaCommon/share/Preparation.py b/Control/AthenaCommon/share/Preparation.py
index 480815d784da0e0047089418b5d38d81bdb36451..0a4786ea1ed3a2eb12ccc082bb48c0f8127a8c19 100644
--- a/Control/AthenaCommon/share/Preparation.py
+++ b/Control/AthenaCommon/share/Preparation.py
@@ -81,22 +81,6 @@ if min_cppyy_vmem_growth:
    del vmem_before_cppyy
 del min_cppyy_vmem_growth, grow_vmem, vmem_mb
 
-from cppyy import gbl
-## backward compat...
-class _AthenaServicesDictBwd:
-  @staticmethod
-  def SetFatalHandler(flags=-1):
-     import AthenaCommon.Logging as L
-     info = L.log.info
-     info("'gbl.AthenaServices.SetFatalHandler(flag)' is DEPRECATED")
-     info("instead, please consider using:")
-     info(" svcMgr.CoreDumpSvc.FatalHandler = flag")
-
-     from AthenaCommon.AppMgr import ServiceMgr as svcMgr
-     svcMgr.CoreDumpSvc.FatalHandler = flags
-setattr(gbl, 'AthenaServices', _AthenaServicesDictBwd)
-del _AthenaServicesDictBwd
-## end --
 if not (not opts.run_batch and theApp.EventLoop == "PyAthenaEventLoopMgr"):
    # make SIG_INT fatal
    svcMgr.CoreDumpSvc.FatalHandler = -1
diff --git a/InnerDetector/InDetDetDescr/PixelCabling/run/dumpCabling_jobOptions.py b/InnerDetector/InDetDetDescr/PixelCabling/run/dumpCabling_jobOptions.py
index 9dbdab7fea11985258aee5ebe892225cf92d524f..99a94377c32969407c9408309f4750d21b0f5748 100644
--- a/InnerDetector/InDetDetDescr/PixelCabling/run/dumpCabling_jobOptions.py
+++ b/InnerDetector/InDetDetDescr/PixelCabling/run/dumpCabling_jobOptions.py
@@ -4,8 +4,6 @@
 ## basic job configuration (for generator)
 import AthenaCommon.AtlasUnixGeneratorJob
 
-# Set handler for traceback
-#gbl.AthenaServices.SetFatalHandler(438)
 from AthenaCommon.GlobalFlags import globalflags
 globalflags.DataSource = 'data'
 
diff --git a/InnerDetector/InDetDetDescr/PixelCabling/run/readCabling_jobOptions.py b/InnerDetector/InDetDetDescr/PixelCabling/run/readCabling_jobOptions.py
index 3c256dfb85bc8db7c34227beac475ce1f94f88f5..51280c9fe8f4f4c4747d2b32ac07737958658d18 100644
--- a/InnerDetector/InDetDetDescr/PixelCabling/run/readCabling_jobOptions.py
+++ b/InnerDetector/InDetDetDescr/PixelCabling/run/readCabling_jobOptions.py
@@ -4,8 +4,6 @@
 ## basic job configuration (for generator)
 import AthenaCommon.AtlasUnixGeneratorJob
 
-# Set handler for traceback
-#gbl.AthenaServices.SetFatalHandler(438)
 from AthenaCommon.GlobalFlags import globalflags
 globalflags.DataSource = 'data'
 
diff --git a/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/share/Pixel_main.py b/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/share/Pixel_main.py
index 0d8ee8434c38d50b862672c1c63a1ad1406af9ee..3fd5d4d3c62da6f999ec1f06b393dbc373b4ad5c 100644
--- a/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/share/Pixel_main.py
+++ b/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/share/Pixel_main.py
@@ -115,8 +115,7 @@ ServiceMgr.StoreGateSvc.Dump            = False
 # get stack dump
 # ------------------------------------------------------------
 
-gbl.AthenaServices.SetFatalHandler(438)
-
+ServiceMgr.CoreDumpSvc.FatalHandler = 438
 
 # ------------------------------------------------------------
 # Use auditors
diff --git a/InnerDetector/InDetExample/InDetRecExample/share/InDetRec_all.py b/InnerDetector/InDetExample/InDetRecExample/share/InDetRec_all.py
index 43fa4afd36414a6ae03adbb6d42d88393b2772dc..95ab8547b5811fef0084ddf4e2824e31b67283e9 100755
--- a/InnerDetector/InDetExample/InDetRecExample/share/InDetRec_all.py
+++ b/InnerDetector/InDetExample/InDetRecExample/share/InDetRec_all.py
@@ -138,7 +138,7 @@ ServiceMgr.StoreGateSvc.Dump            = False
 # get stack dump
 # ------------------------------------------------------------
 
-gbl.AthenaServices.SetFatalHandler(438)
+ServiceMgr.CoreDumpSvc.FatalHandler = 438
 
 #--------------------------------------------------------------
 # run JiveXML for Atlantis event display
diff --git a/InnerDetector/InDetExample/InDetTrigRecExample/share/jobOptionsNewSteering.py b/InnerDetector/InDetExample/InDetTrigRecExample/share/jobOptionsNewSteering.py
index 33de8b9bc158c4e0decb40c03788aac2d2f5dfca..def20c510f7028515432f22f919da5886fcb09d2 100755
--- a/InnerDetector/InDetExample/InDetTrigRecExample/share/jobOptionsNewSteering.py
+++ b/InnerDetector/InDetExample/InDetTrigRecExample/share/jobOptionsNewSteering.py
@@ -364,8 +364,8 @@ ServiceMgr.StoreGateSvc.Dump            = False
 # get stack dump
 # ------------------------------------------------------------
 
-gbl.AthenaServices.SetFatalHandler(438)
-         
+ServiceMgr.CoreDumpSvc.FatalHandler = 438
+
 if doAuditors:
  # load AuditorSvc
  theAuditorSvc = AuditorSvc()
diff --git a/InnerDetector/InDetExample/InDetTrigRecExample/share/jobOptions_RTT_InDetTrigRecExample.py b/InnerDetector/InDetExample/InDetTrigRecExample/share/jobOptions_RTT_InDetTrigRecExample.py
index 844fce15c950a380d22fb200fa95896a39fc5b7e..370a1ac7b899c97c769f0bea851507161dbe66da 100755
--- a/InnerDetector/InDetExample/InDetTrigRecExample/share/jobOptions_RTT_InDetTrigRecExample.py
+++ b/InnerDetector/InDetExample/InDetTrigRecExample/share/jobOptions_RTT_InDetTrigRecExample.py
@@ -363,7 +363,7 @@ ServiceMgr.StoreGateSvc.Dump            = False
 # get stack dump
 # ------------------------------------------------------------
 
-gbl.AthenaServices.SetFatalHandler(438)
+ServiceMgr.CoreDumpSvc.FatalHandler = 438
          
 if doAuditors:
  # load AuditorSvc
diff --git a/InnerDetector/InDetExample/InDetTrigRecExample/share/jobOptions_RTT_InDetTrigRecExample_backTracking.py b/InnerDetector/InDetExample/InDetTrigRecExample/share/jobOptions_RTT_InDetTrigRecExample_backTracking.py
index 95ec2cb520f2bdd57bc8e13b33618d2085ba97ca..44aa7c83f0d16b75e2f99fda6dde2d555d6af07f 100755
--- a/InnerDetector/InDetExample/InDetTrigRecExample/share/jobOptions_RTT_InDetTrigRecExample_backTracking.py
+++ b/InnerDetector/InDetExample/InDetTrigRecExample/share/jobOptions_RTT_InDetTrigRecExample_backTracking.py
@@ -316,8 +316,8 @@ ServiceMgr.StoreGateSvc.Dump            = False
 # get stack dump
 # ------------------------------------------------------------
 
-gbl.AthenaServices.SetFatalHandler(438)
-         
+ServiceMgr.CoreDumpSvc.FatalHandler = 438
+
 if doAuditors:
  # load AuditorSvc
  theAuditorSvc = AuditorSvc()
diff --git a/InnerDetector/InDetExample/InDetTrigRecExample/share/jobOptions_RTT_InDetTrigRecExample_doReadBS.py b/InnerDetector/InDetExample/InDetTrigRecExample/share/jobOptions_RTT_InDetTrigRecExample_doReadBS.py
index 0ec9c1afe9f7d0369e9ee739ebd9d6b96eab4582..b44c7b1593a5b0255a5b25e732aa49ca1aef6fee 100755
--- a/InnerDetector/InDetExample/InDetTrigRecExample/share/jobOptions_RTT_InDetTrigRecExample_doReadBS.py
+++ b/InnerDetector/InDetExample/InDetTrigRecExample/share/jobOptions_RTT_InDetTrigRecExample_doReadBS.py
@@ -366,8 +366,8 @@ ServiceMgr.StoreGateSvc.Dump            = False
 # get stack dump
 # ------------------------------------------------------------
 
-gbl.AthenaServices.SetFatalHandler(438)
-         
+ServiceMgr.CoreDumpSvc.FatalHandler = 438
+
 if doAuditors:
  # load AuditorSvc
  theAuditorSvc = AuditorSvc()
diff --git a/InnerDetector/InDetRecTools/PixelToTPIDTool/share/PixeldEdxWriteCool.py b/InnerDetector/InDetRecTools/PixelToTPIDTool/share/PixeldEdxWriteCool.py
index d8f6a3b29ab1d86e51734b3564247a69172b8ac0..49a6f70bb9d383dec3645e136ff0306cd5a5d74b 100755
--- a/InnerDetector/InDetRecTools/PixelToTPIDTool/share/PixeldEdxWriteCool.py
+++ b/InnerDetector/InDetRecTools/PixelToTPIDTool/share/PixeldEdxWriteCool.py
@@ -7,10 +7,6 @@
 ## basic job configuration (for generator)
 import AthenaCommon.AtlasUnixGeneratorJob
 
-# Set handler for traceback
-#gbl.AthenaServices.SetFatalHandler(438)
-
-
 ## get a handle to the default top-level algorithm sequence
 from AthenaCommon.AlgSequence import AlgSequence
 topSequence = AlgSequence()
diff --git a/Reconstruction/RecExample/RecExCommon/share/AnalysisCommon_topOptions.py b/Reconstruction/RecExample/RecExCommon/share/AnalysisCommon_topOptions.py
index 2e2f17f498e5161d1c19a303b92667407019975f..f338c8e157681dd6ac3a79a6a3694828bb4a3227 100644
--- a/Reconstruction/RecExample/RecExCommon/share/AnalysisCommon_topOptions.py
+++ b/Reconstruction/RecExample/RecExCommon/share/AnalysisCommon_topOptions.py
@@ -4,7 +4,6 @@ include.block ("RecExCommon/AnalysisCommon_topOptions.py")
 ## Common job preparation ##
 ############################
 
-# gbl.AthenaServices.SetFatalHandler(438)
 svcMgr.CoreDumpSvc.FatalHandler = 438
 import traceback
 
diff --git a/Reconstruction/RecExample/RecExCommon/share/RecExCommon_topOptions.py b/Reconstruction/RecExample/RecExCommon/share/RecExCommon_topOptions.py
index 0cf0bb1102499b540dcb8d7985179c1d160a0e40..c187b44259ff514e346d9d0799ec604168607f96 100644
--- a/Reconstruction/RecExample/RecExCommon/share/RecExCommon_topOptions.py
+++ b/Reconstruction/RecExample/RecExCommon/share/RecExCommon_topOptions.py
@@ -4,7 +4,6 @@ include.block ("RecExCommon/RecExCommon_topOptions.py")
 ## Common job preparation ##
 ############################
 
-# gbl.AthenaServices.SetFatalHandler(438)
 svcMgr.CoreDumpSvc.FatalHandler = 438
 import traceback
 
diff --git a/Trigger/TrigT1/L1Topo/L1TopoSimulation/share/L1Simulation_topOptions.py b/Trigger/TrigT1/L1Topo/L1TopoSimulation/share/L1Simulation_topOptions.py
index 3adcb674d2e338bd57c5381cfc9c8544a059b667..b4c57f5de582eb2f9317d524aa566787859bc09a 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoSimulation/share/L1Simulation_topOptions.py
+++ b/Trigger/TrigT1/L1Topo/L1TopoSimulation/share/L1Simulation_topOptions.py
@@ -1,6 +1,5 @@
 include.block ("L1TopoSimulation/L1Simulation_topOptions.py")
 
-# gbl.AthenaServices.SetFatalHandler(438)
 svcMgr.CoreDumpSvc.FatalHandler = 438
 import traceback