diff --git a/DetectorDescription/GeoModel/AtlasGeoModel/python/InDetGMJobProperties.py b/DetectorDescription/GeoModel/AtlasGeoModel/python/InDetGMJobProperties.py
index 0d1df8db4b4425ea7ae8dd456cc9ddf2488a7277..ff17d174aaed3eb2bc92e2cf5f1ddd7ef6ceaa65 100755
--- a/DetectorDescription/GeoModel/AtlasGeoModel/python/InDetGMJobProperties.py
+++ b/DetectorDescription/GeoModel/AtlasGeoModel/python/InDetGMJobProperties.py
@@ -155,14 +155,6 @@ class InDetGeometryFlags_JobProperties(JobPropertyContainer):
         self.GeoVersionName.set_Value_and_Lock(InDetGeoFlags.getValue("VersionName"))
         self.GeoLayout.set_Value_and_Lock(InDetGeoFlags.getValue("Layout"))
 
-    def setupDynamicAlignFolders(self):
-        from AthenaCommon.GlobalFlags import globalflags
-        from IOVDbSvc.CondDB import conddb
-        # Disable for MC or for Run 1 (AlignL* folders are not in COMP200).
-        if globalflags.DataSource.get_Value() != 'data' or conddb.dbname == 'COMP200':
-            self.useDynamicAlignFolders.set_Value_and_Lock(False)
-
-
     def reset(self,geoTagName="none"):
         
         self.isSLHC.unlock()
@@ -197,6 +189,5 @@ jobproperties.InDetGeometryFlags_JobProperties.add_JobProperty(useDynamicAlignFo
 
 InDetGeometryFlags = jobproperties.InDetGeometryFlags_JobProperties
 InDetGeometryFlags.setupValuesFromDB()
-InDetGeometryFlags.setupDynamicAlignFolders()
 
 
diff --git a/DetectorDescription/IdDictDetDescrCnv/share/IdDictDetDescrCnv_joboptions.py b/DetectorDescription/IdDictDetDescrCnv/share/IdDictDetDescrCnv_joboptions.py
index 8fd587c2d63e9aab2da7e3df586ecba732cf709d..520c0cddab2c7fef91ecc7ee478836c46b16e6cf 100755
--- a/DetectorDescription/IdDictDetDescrCnv/share/IdDictDetDescrCnv_joboptions.py
+++ b/DetectorDescription/IdDictDetDescrCnv/share/IdDictDetDescrCnv_joboptions.py
@@ -2,6 +2,17 @@
 #  Joboptions for the loading of the of InDetDDMgr
 #
 
+_log = logging.getLogger( 'IdDictDetDescrCnv_joboptions' )
+from AthenaCommon.GlobalFlags  import globalflags
+from IOVDbSvc.CondDB import conddb
+
+# Disable for MC or for Run 1 (AlignL* folders are not in COMP200).
+if globalflags.DataSource.get_Value() != 'data' or conddb.dbname == 'COMP200':
+    _log.info("Disabling ID dynamic alignment")
+    from AtlasGeoModel.InDetGMJobProperties import InDetGeometryFlags
+    InDetGeometryFlags.useDynamicAlignFolders=False
+
 # DLLs 
 theApp.Dlls += [ "IdDictDetDescrCnv" ]
 
+del _log
diff --git a/Simulation/SimuJobTransforms/share/CommonSkeletonJobOptions.py b/Simulation/SimuJobTransforms/share/CommonSkeletonJobOptions.py
index 791a3031c5bdcd11f52723c528cce137d27dd870..f25b14d8815e7ec66e3f89d3a62688d2373bfc18 100644
--- a/Simulation/SimuJobTransforms/share/CommonSkeletonJobOptions.py
+++ b/Simulation/SimuJobTransforms/share/CommonSkeletonJobOptions.py
@@ -37,6 +37,10 @@ if hasattr(runArgs,"beamType"):
 if hasattr(runArgs, "eventService") and runArgs.eventService:
     import AthenaMP.EventService
 
+# Disable this while MC still uses old alignment folders
+from AtlasGeoModel.InDetGMJobProperties import InDetGeometryFlags
+InDetGeometryFlags.useDynamicAlignFolders=False
+
 ## autoConfiguration keywords triggering pre-defined functions
 ## if hasattr(runArgs,"autoConfiguration"):
 ##     for key in runArgs.autoConfiguration: