Clean up caching of and references to builtins mock AST

3 files changed, 2 insertions, 4 deletions

diff --git a/astroid/__init__.py b/astroid/__init__.py
index ed0ab638..270e18ba 100644
--- a/astroid/__init__.py
+++ b/astroid/__init__.py
@@ -65,7 +65,6 @@ from astroid.nodes import *
 from astroid import inference
 
 from astroid import raw_building
-from astroid.raw_building import builtins_ast as builtins
 from astroid.interpreter.util import are_exclusive, unpack_infer
 from astroid.tree.scoped_nodes import builtin_lookup
 from astroid.builder import parse
diff --git a/astroid/manager.py b/astroid/manager.py
index 918ed9df..8d4e5026 100644
--- a/astroid/manager.py
+++ b/astroid/manager.py
@@ -222,5 +222,4 @@ class AstroidManager(object):
     def clear_cache(self):
         self.astroid_cache.clear()
         from astroid import raw_building
-        # self.astroid_cache[six.moves.builtins.__name__] = raw_building.ast_from_builtins()
-        self.astroid_cache[six.moves.builtins.__name__] = raw_building.builtins_ast
+        self.astroid_cache[six.moves.builtins.__name__] = raw_building.ast_from_builtins()
diff --git a/astroid/tree/scoped_nodes.py b/astroid/tree/scoped_nodes.py
index a5fe473c..c9cd843e 100644
--- a/astroid/tree/scoped_nodes.py
+++ b/astroid/tree/scoped_nodes.py
@@ -968,7 +968,7 @@ class CallSite(object):
 @util.register_implementation(treeabc.Lambda)
 class Lambda(mixins.FilterStmtsMixin, LocalsDictNodeNG):
     _astroid_fields = ('args', 'body',)
-    _other_other_fields = ('locals',)
+    # _other_other_fields = ('locals',)
     name = '<lambda>'
 
     # function's type, 'function' | 'method' | 'staticmethod' | 'classmethod'