@@ -129,13 +129,8 @@ def emit_environment_object(self):
         self.context.declare_env_global(self.module, envname)
 
     def lower(self):
-        # DRD : Add this hack for the time ebing. Having a global env pointer,
-        # even if it is a null pointer, breaks spirv-val.
-        context_name = getattr(self.context, 'context_name', '')
-        if not context_name in ("dppl.jit",):
-                # Emit the Env into the module
-                self.emit_environment_object()
-
+        # Emit the Env into the module
+        self.emit_environment_object()
         if self.generator_info is None:
             self.genlower = None
             self.lower_normal_function(self.fndesc)