diff --git a/generator/osm2type.cpp b/generator/osm2type.cpp
index 2826b777f4..ee6b878e45 100644
--- a/generator/osm2type.cpp
+++ b/generator/osm2type.cpp
@@ -16,9 +16,6 @@
 #include "std/function.hpp"
 #include "std/initializer_list.hpp"
 
-#include <QtCore/QString>
-
-
 namespace ftype
 {
   namespace
@@ -108,15 +105,6 @@ namespace ftype
       });
     }
 
-    string Normalize(string const & s)
-    {
-      // Unicode Compatibility Decomposition,
-      // followed by Canonical Composition (NFKC).
-      // Needed for better search matching.
-      QByteArray ba = QString::fromUtf8(s.c_str()).normalized(QString::NormalizationForm_KC).toUtf8();
-      return ba.constData();
-    }
-
     class NamesExtractor
     {
       set<string> m_savedNames;
@@ -158,7 +146,7 @@ namespace ftype
         if (v.empty() || !GetLangByKey(k, lang))
           return false;
 
-        m_params.AddName(lang, Normalize(v));
+        m_params.AddName(lang, v);
         k.clear();
         v.clear();
         return false;
@@ -529,14 +517,14 @@ namespace ftype
       { "hotel", "yes", [](string & k, string & v) { k.swap(v); k = "tourism"; }},
       { "building", "entrance", [](string & k, string & v) { k.swap(v); v = "yes"; }},
 
-      { "addr:city", "*", [&params](string & k, string & v) { params.AddPlace(Normalize(v)); k.clear(); v.clear(); }},
-      { "addr:place", "*", [&params](string & k, string & v) { params.AddPlace(Normalize(v)); k.clear(); v.clear(); }},
-      { "addr:housenumber", "*", [&params](string & k, string & v) { params.AddHouseName(Normalize(v)); k.clear(); v.clear(); }},
-      { "addr:housename", "*", [&params](string & k, string & v) { params.AddHouseName(Normalize(v)); k.clear(); v.clear(); }},
-      { "addr:street", "*", [&params](string & k, string & v) { params.AddStreet(Normalize(v)); k.clear(); v.clear(); }},
-      //{ "addr:streetnumber", "*", [&params](string & k, string & v) { params.AddStreet(Normalize(v)); k.clear(); v.clear(); }},
-      //{ "addr:full", "*", [&params](string & k, string & v) { params.AddAddress(Normalize(v)); k.clear(); v.clear(); }},
-      { "addr:postcode", "*", [&params](string & k, string & v) { params.AddPostcode(Normalize(v)); k.clear(); v.clear(); }},
+      { "addr:city", "*", [&params](string & k, string & v) { params.AddPlace(v); k.clear(); v.clear(); }},
+      { "addr:place", "*", [&params](string & k, string & v) { params.AddPlace(v); k.clear(); v.clear(); }},
+      { "addr:housenumber", "*", [&params](string & k, string & v) { params.AddHouseName(v); k.clear(); v.clear(); }},
+      { "addr:housename", "*", [&params](string & k, string & v) { params.AddHouseName(v); k.clear(); v.clear(); }},
+      { "addr:street", "*", [&params](string & k, string & v) { params.AddStreet(v); k.clear(); v.clear(); }},
+      //{ "addr:streetnumber", "*", [&params](string & k, string & v) { params.AddStreet(v); k.clear(); v.clear(); }},
+      //{ "addr:full", "*", [&params](string & k, string & v) { params.AddAddress(v); k.clear(); v.clear(); }},
+      { "addr:postcode", "*", [&params](string & k, string & v) { params.AddPostcode(v); k.clear(); v.clear(); }},
 
       { "population", "*", [&params](string & k, string & v)
         {