diff --git a/Configuration/Geometry/python/GeometryExtended_cff.py b/Configuration/Geometry/python/GeometryExtended_cff.py
index f93f875cc6def..0cc0780d25462 100644
--- a/Configuration/Geometry/python/GeometryExtended_cff.py
+++ b/Configuration/Geometry/python/GeometryExtended_cff.py
@@ -1,3 +1,6 @@
+import warnings
+warnings.warn('ATTENTION: This job uses Run 1 Geometry.')
+
 import FWCore.ParameterSet.Config as cms
 
 #
diff --git a/Configuration/StandardSequences/python/GeometryExtended_cff.py b/Configuration/StandardSequences/python/GeometryExtended_cff.py
index 90ca0c73818a8..c8cd57ca74736 100644
--- a/Configuration/StandardSequences/python/GeometryExtended_cff.py
+++ b/Configuration/StandardSequences/python/GeometryExtended_cff.py
@@ -1,6 +1,4 @@
 import FWCore.ParameterSet.Config as cms
 
-# Ideal geometry, needed for simulation
-from Geometry.CMSCommonData.cmsExtendedGeometryXML_cfi import *
-from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
+from Configuration.Geometry.GeometryExtended_cff import *