diff --git a/lib/cdist/context.py b/lib/cdist/context.py
index ed1fd31d..cf314409 100644
--- a/lib/cdist/context.py
+++ b/lib/cdist/context.py
@@ -41,8 +41,6 @@ class Context(object):
         debug=False):
 
         self.debug      = debug
-        if self.debug:
-            os.environ['__debug'] = 'yes'
 
         self.target_host    = target_host