diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
index 0762d1f0f6cb..6505ed935b14 100644
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -196,7 +196,6 @@
 #endif
 @BINPATH@/components/locale.xpt
 @BINPATH@/components/lwbrk.xpt
-@BINPATH@/components/microsummaries.xpt
 #ifndef WINCE
 @BINPATH@/components/migration.xpt
 #endif
diff --git a/toolkit/components/places/src/nsMicrosummaryService.js b/toolkit/components/places/src/nsMicrosummaryService.js
index 31b6ea254337..0287cebb0172 100644
--- a/toolkit/components/places/src/nsMicrosummaryService.js
+++ b/toolkit/components/places/src/nsMicrosummaryService.js
@@ -2161,7 +2161,7 @@ function sanitizeName(aName) {
 
   // If our input had not enough valid characters, use a random name.
   if (name.length < MIN_GENERATOR_NAME_LENGTH)
-    name = Math.random().toString(36).substr(2);
+    name = Math.random().toString(36).replace(/^.*\./, '');
 
   // Force max length.
   return name.substring(0, MAX_GENERATOR_NAME_LENGTH);