Revert "Try to fix the type rewriter."

This reverts commit 33b19f0210cd6ab1504071912caee91a95515c7c.

1 files changed, 2 insertions, 3 deletions

diff --git a/src/libs/cplusplus/ResolveExpression.cpp b/src/libs/cplusplus/ResolveExpression.cpp
index 8bbdb8f05a0..651af198717 100644
--- a/src/libs/cplusplus/ResolveExpression.cpp
+++ b/src/libs/cplusplus/ResolveExpression.cpp
@@ -568,10 +568,9 @@ QList<LookupItem> ResolveExpression::getMembers(ClassOrNamespace *binding, const
                 }
 
                 SubstitutionEnvironment env;
-                if (m.scope())
-                    env.switchScope(m.scope());
-                env.setContext(_context);
+                ContextSubstitution ctxSubst(_context, m.scope());
 
+                env.enter(&ctxSubst);
                 env.enter(&map);
                 FullySpecifiedType instantiatedTy = rewriteType(decl->type(), &env, _context.control().data());