---
 libs/Flocale.c |    2 ++
 1 file changed, 2 insertions(+)

--- libs/Flocale.c
+++ libs/Flocale.c	2016-08-02 13:49:28.893927858 +0000
@@ -2318,6 +2318,7 @@ void FlocaleGetNameProperty(
 	{
 		return;
 	}
+#if 0
 	if (text_prop.encoding == XA_STRING)
 	{
 		/* STRING encoding, use this as it is */
@@ -2326,6 +2327,7 @@ void FlocaleGetNameProperty(
 		return;
 	}
 	/* not STRING encoding, try to convert XA_COMPOUND_TEXT */
+#endif
 	if (XmbTextPropertyToTextList(dpy, &text_prop, &list, &num) >= Success
 	    && num > 0 && *list)
 	{