--- a/hgdemandimport/__init__.py	Fri Aug 18 11:08:17 2017 -0700
+++ b/hgdemandimport/__init__.py	Wed Aug 16 10:44:06 2017 -0700
@@ -73,5 +73,7 @@
 deactivated = demandimport.deactivated
 
 def enable():
-    if os.environ.get('HGDEMANDIMPORT') != 'disable':
+    # chg pre-imports modules so do not enable demandimport for it
+    if ('CHGINTERNALMARK' not in os.environ
+        and os.environ.get('HGDEMANDIMPORT') != 'disable'):
         demandimport.enable()