diff --git a/headers/private/servers/app/FontFamily.h b/headers/private/servers/app/FontFamily.h
index 81eb0cabe7..57f3a3241a 100644
--- a/headers/private/servers/app/FontFamily.h
+++ b/headers/private/servers/app/FontFamily.h
@@ -120,15 +120,12 @@ public:
 	const char *Name(void);
 	FontFamily *Family(void) { return family; }
 
-	// TODO: Re-enable when I understand how the FT2 Cache system changed from
-	// 2.1.4 to 2.1.8
-//	FT_Face GetFace(void);
+	FT_Face GetFace(void);
 
 	const char *GetPath(void);
 
-	// TODO: Re-enable when I understand how the FT2 Cache system changed from
-	// 2.1.4 to 2.1.8
-//	int16 ConvertToUnicode(uint16 c);
+	int16 ConvertToUnicode(uint16 c);
+
 protected:
 	friend class FontFamily;
 	FontFamily *family;
diff --git a/src/servers/app/server/FontFamily.cpp b/src/servers/app/server/FontFamily.cpp
index f7c902424e..dcd0c5579e 100644
--- a/src/servers/app/server/FontFamily.cpp
+++ b/src/servers/app/server/FontFamily.cpp
@@ -96,16 +96,11 @@ const char *FontStyle::Name(void)
 	\brief Returns a handle to the style in question, straight from FreeType's cache
 	\return FreeType face handle or NULL if there was an internal error
 */
-
-// TODO: Re-enable when I understand how the FT2 Cache system changed from
-// 2.1.4 to 2.1.8
-/*
 FT_Face FontStyle::GetFace(void)
 {
 	FT_Face f;
-	return (FTC_Manager_Lookup_Face(ftmanager,cachedface,&f)!=0)?f:NULL;
+	return (FTC_Manager_LookupFace(ftmanager,(FTC_FaceID)cachedface,&f)!=0)?f:NULL;
 }
-*/
 
 /*!
 	\brief Returns the path to the style's font file 
@@ -121,19 +116,14 @@ const char *FontStyle::GetPath(void)
 	\param c An ASCII character
 	\return A Unicode value for the character
 */
-
-// TODO: Re-enable when I understand how the FT2 Cache system changed from
-// 2.1.4 to 2.1.8
-/*
 int16 FontStyle::ConvertToUnicode(uint16 c)
 {
 	FT_Face f;
-	if(FTC_Manager_Lookup_Face(ftmanager,cachedface,&f)!=0)
+	if(FTC_Manager_LookupFace(ftmanager,(FTC_FaceID)cachedface,&f)!=0)
 		return 0;
 	
 	return FT_Get_Char_Index(f,c);
 }
-*/
 
 /*!
 	\brief Creates a new ServerFont object for the style, given size, shear, and rotation.