diff --git a/ChangeLog b/ChangeLog
index 7f1845f..5814892 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-11-02  Patrick Lam  <plam@mit.edu>
+	* fc-cache/fc-cache.c (scanDirs):
+	* src/fcpat.c (FcValueListSerialize):
+
+	Revert the previous patch and commit the correct patch:
+	I forgot a canonicalization in FcValueListSerialize, so
+	that it would choke on already-serialized input files.  Duh!
+
 2005-11-02  Patrick Lam  <plam@mit.edu>
 	* fc-cache/fc-cache.c (scanDirs):
 
diff --git a/fc-cache/fc-cache.c b/fc-cache/fc-cache.c
index 3a4b786..388baa7 100644
--- a/fc-cache/fc-cache.c
+++ b/fc-cache/fc-cache.c
@@ -207,15 +207,6 @@ scanDirs (FcStrList *list, FcConfig *config, char *program, FcBool force, FcBool
                 if (!FcDirCacheUnlink (dir))
                     ret++;
 
-	    if (!FcDirScan (set, subdirs, 0, FcConfigGetBlanks (config), dir, FcTrue))
-	    {
-		fprintf (stderr, "\"%s\": error scanning\n", dir);
-		FcFontSetDestroy (set);
-		FcStrSetDestroy (subdirs);
-		ret++;
-		continue;
-	    }
-
 	    if (!FcDirSave (set, subdirs, dir))
 	    {
 		fprintf (stderr, "Can't save cache in \"%s\"\n", dir);
diff --git a/src/fcpat.c b/src/fcpat.c
index b7f5279..fa63ea3 100644
--- a/src/fcpat.c
+++ b/src/fcpat.c
@@ -1718,6 +1718,7 @@ FcValueListSerialize(int bank, FcValueList *pi)
     fcvaluelists[bi][fcvaluelist_ptr] = *pi;
     new.bank = bank;
     new.u.stat = fcvaluelist_ptr++;
+    fcvaluelists[bi][new.u.stat].value = FcValueCanonicalize (&pi->value);
     v = &fcvaluelists[bi][new.u.stat].value;
     switch (v->type)
     {