diff --git a/plugins/standard_fonts_metrics.js b/plugins/standard_fonts_metrics.js
index 19ca6c685..38f671e9d 100644
--- a/plugins/standard_fonts_metrics.js
+++ b/plugins/standard_fonts_metrics.js
@@ -334,59 +334,36 @@ somewhere around "pdfEscape" call.
 */
 
 API.events.push([ 
-	'addFonts'
-	,function(fontManagementObjects) {
-		// fontManagementObjects is {
-		//	'fonts':font_ID-keyed hash of font objects
-		//	, 'dictionary': lookup object, linking ["FontFamily"]['Style'] to font ID
-		//}
-		var font
-		, fontID
-		, metrics
+	'addFont'
+	,function(font) {
+		var metrics
 		, unicode_section
 		, encoding = 'Unicode'
-		, encodingBlock
-
-		for (fontID in fontManagementObjects.fonts){
-			if (fontManagementObjects.fonts.hasOwnProperty(fontID)) {
-				font = fontManagementObjects.fonts[fontID]
-
-				// // we only ship 'Unicode' mappings and metrics. No need for loop.
-				// // still, leaving this for the future.
-
-				// for (encoding in fontMetrics){
-				// 	if (fontMetrics.hasOwnProperty(encoding)) {
-
-						metrics = fontMetrics[encoding][font.PostScriptName]
-						if (metrics) {
-							if (font.metadata[encoding]) {
-								unicode_section = font.metadata[encoding]
-							} else {
-								unicode_section = font.metadata[encoding] = {}
-							}
-
-							unicode_section.widths = metrics.widths
-							unicode_section.kerning = metrics.kerning
-						}
-				// 	}
-				// }
-				// for (encoding in encodings){
-				// 	if (encodings.hasOwnProperty(encoding)) {
-						encodingBlock = encodings[encoding][font.PostScriptName]
-						if (encodingBlock) {
-							if (font.metadata[encoding]) {
-								unicode_section = font.metadata[encoding]
-							} else {
-								unicode_section = font.metadata[encoding] = {}
-							}
-
-							unicode_section.encoding = encodingBlock
-							if (encodingBlock.codePages && encodingBlock.codePages.length) {
-								font.encoding = encodingBlock.codePages[0]
-							}
-						}
-				// 	}
-				// }
+		, encodingBlock;
+
+		metrics = fontMetrics[encoding][font.PostScriptName];
+		if (metrics) {
+			if (font.metadata[encoding]) {
+				unicode_section = font.metadata[encoding];
+			} else {
+				unicode_section = font.metadata[encoding] = {};
+			}
+
+			unicode_section.widths = metrics.widths;
+			unicode_section.kerning = metrics.kerning;
+		}
+
+		encodingBlock = encodings[encoding][font.PostScriptName];
+		if (encodingBlock) {
+			if (font.metadata[encoding]) {
+				unicode_section = font.metadata[encoding];
+			} else {
+				unicode_section = font.metadata[encoding] = {};
+			}
+
+			unicode_section.encoding = encodingBlock;
+			if (encodingBlock.codePages && encodingBlock.codePages.length) {
+				font.encoding = encodingBlock.codePages[0];
 			}
 		}
 	}