diff --git a/legacy/evas/src/lib/engines/common/evas_font_load.c b/legacy/evas/src/lib/engines/common/evas_font_load.c
index 0489f7b63b..15889f4891 100644
--- a/legacy/evas/src/lib/engines/common/evas_font_load.c
+++ b/legacy/evas/src/lib/engines/common/evas_font_load.c
@@ -79,7 +79,7 @@ _evas_common_font_int_free(RGBA_Font_Int *fi)
 //   eina_hash_foreach(fi->glyphs, font_flush_free_glyph_cb, NULL);
 //   eina_hash_free(fi->glyphs);
 
-//   eina_hash_free(fi->kerning);
+  eina_hash_free(fi->kerning);
 //   eina_hash_free(fi->indexes);
 
 #ifdef HAVE_PTHREAD
@@ -276,10 +276,10 @@ _evas_common_font_int_cache_init(RGBA_Font_Int *fi)
 //			       EINA_KEY_CMP(_evas_common_font_int_cmp),
 //			       EINA_KEY_HASH(eina_hash_int32),
 //			       free, 3);
-//   fi->kerning = eina_hash_new(NULL,
-//			       EINA_KEY_CMP(_evas_common_font_double_int_cmp),
-//			       EINA_KEY_HASH(_evas_common_font_double_int_hash),
-//			       free, 3);
+  fi->kerning = eina_hash_new(NULL,
+			       EINA_KEY_CMP(_evas_common_font_double_int_cmp),
+			       EINA_KEY_HASH(_evas_common_font_double_int_hash),
+			       free, 3);
 #ifdef HAVE_PTHREAD
    pthread_mutex_init(&fi->ft_mutex, NULL);
 #endif
diff --git a/legacy/evas/src/lib/engines/common/evas_font_query.c b/legacy/evas/src/lib/engines/common/evas_font_query.c
index 6336e91543..2298bf41f1 100644
--- a/legacy/evas/src/lib/engines/common/evas_font_query.c
+++ b/legacy/evas/src/lib/engines/common/evas_font_query.c
@@ -12,19 +12,19 @@ evas_common_font_query_kerning(RGBA_Font_Int* fi,
    int error = 1;
 
 //   return 0;
-//   key[0] = prev;
-//   key[1] = index;
+   key[0] = prev;
+   key[1] = index;
 
 #ifdef HAVE_PTHREAD
-//   pthread_mutex_lock(&fi->ft_mutex);
+   pthread_mutex_lock(&fi->ft_mutex);
 #endif
 
-//   result = eina_hash_find(fi->kerning, key);
-//   if (result)
-//     {
-//	*kerning = result[2];
-//	goto on_correct;
-//     }
+   result = eina_hash_find(fi->kerning, key);
+   if (result)
+     {
+	*kerning = result[2];
+	goto on_correct;
+     }
 
    /* NOTE: ft2 seems to have a bug. and sometimes returns bizarre
     * values to kern by - given same font, same size and same
@@ -34,18 +34,18 @@ evas_common_font_query_kerning(RGBA_Font_Int* fi,
 		      key[0], key[1],
 		      ft_kerning_default, &delta) == 0)
      {
-//	int *push;
+	int *push;
 
 	*kerning = delta.x >> 6;
 
-//	push = malloc(sizeof (int) * 3);
-//	if (!push) return 1;
+	push = malloc(sizeof (int) * 3);
+	if (!push) return 1;
 
-//	push[0] = key[0];
-//	push[1] = key[1];
-//	push[2] = *kerning;
+	push[0] = key[0];
+	push[1] = key[1];
+	push[2] = *kerning;
 
-//	eina_hash_direct_add(fi->kerning, push, push);
+	eina_hash_direct_add(fi->kerning, push, push);
 
 	goto on_correct;
      }
@@ -54,7 +54,7 @@ evas_common_font_query_kerning(RGBA_Font_Int* fi,
 
  on_correct:
 #ifdef HAVE_PTHREAD
-//   pthread_mutex_unlock(&fi->ft_mutex);
+   pthread_mutex_unlock(&fi->ft_mutex);
 #endif
    return error;
 }