Revert "Try to fix the type rewriter."

This reverts commit 33b19f0210.

src/plugins/cppeditor/cppquickfix.cpp

@@ -37,7 +37,6 @@
 #include <cplusplus/Overview.h>
 #include <cplusplus/TypeOfExpression.h>
 #include <cplusplus/DependencyTable.h>
-#include <cplusplus/CppRewriter.h>
 
 #include <TranslationUnit.h>
 #include <ASTVisitor.h>
@@ -1547,18 +1546,8 @@ public:
                                                           TypeOfExpression::Preprocess);
 
         if (! result.isEmpty()) {
-
-            SubstitutionEnvironment env;
-            env.setContext(context());
-            env.switchScope(result.first().scope());
-            UseQualifiedNames q;
-            env.enter(&q);
-
-            Control *control = context().control().data();
-            FullySpecifiedType tn = rewriteType(result.first().type(), &env, control);
-
             Overview oo;
-            QString ty = oo(tn);
+            QString ty = oo(result.first().type());
             if (! ty.isEmpty()) {
                 const QChar ch = ty.at(ty.size() - 1);