diff --git a/lib/ansible/plugins/action/raw.py b/lib/ansible/plugins/action/raw.py
index 4774b3ade59..ae3d53a3660 100644
--- a/lib/ansible/plugins/action/raw.py
+++ b/lib/ansible/plugins/action/raw.py
@@ -26,11 +26,9 @@ class ActionModule(ActionBase):
     def run(self, tmp=None, task_vars=None):
         if task_vars is None:
             task_vars = dict()
-        else:
-            if 'vars' in task_vars:
-                if 'environment' in task_vars['vars']:
-                    # The environment key only exists if explicitly declared in the task or in the play
-                    self._display.warning('raw module does not support the environment keyword')
+
+        if self._task.environment:
+            self._display.warning('raw module does not support the environment keyword')
 
         result = super(ActionModule, self).run(tmp, task_vars)