diff --git a/salt/fileserver/__init__.py b/salt/fileserver/__init__.py
index cbdf99d056..ec561f0c03 100644
--- a/salt/fileserver/__init__.py
+++ b/salt/fileserver/__init__.py
@@ -490,6 +490,12 @@ class Fileserver(object):
             return ret
         return list(ret)
 
+    def file_envs(self, load):
+        '''
+        Return environments for all backends for requests from fileclient
+        '''
+        return self.envs()
+
     def init(self, back=None):
         '''
         Initialize the backend, only do so if the fs supports an init function
diff --git a/salt/master.py b/salt/master.py
index c31a56327d..8a103cccfd 100644
--- a/salt/master.py
+++ b/salt/master.py
@@ -963,7 +963,7 @@ class AESFuncs(object):
         self._file_list_emptydirs = self.fs_.file_list_emptydirs
         self._dir_list = self.fs_.dir_list
         self._symlink_list = self.fs_.symlink_list
-        self._file_envs = self.fs_.envs
+        self._file_envs = self.fs_.file_envs
 
     def __verify_minion(self, id_, token):
         '''