diff --git a/mozilla/extensions/schema-validation/tests/schema-complex-test.html b/mozilla/extensions/schema-validation/tests/schema-complex-test.html
index 72b1d0b8abe..970117e2353 100644
--- a/mozilla/extensions/schema-validation/tests/schema-complex-test.html
+++ b/mozilla/extensions/schema-validation/tests/schema-complex-test.html
@@ -53,7 +53,7 @@
       netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
 
        try{
-          var myValidator = Components.classes["@mozilla.org/schemavalidator;1"].getService(Components.interfaces.nsISchemaValidator);
+          var myValidator = Components.classes["@mozilla.org/schemavalidator;1"].createInstance(Components.interfaces.nsISchemaValidator);
         } catch(e){ alert(e) }
 
         var schemaLoader = Components.classes["@mozilla.org/xmlextras/schemas/schemaloader;1"]
@@ -129,7 +129,7 @@
       netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
 
      try{
-        myValidator = Components.classes["@mozilla.org/schemavalidator;1"].getService(Components.interfaces.nsISchemaValidator);
+        myValidator = Components.classes["@mozilla.org/schemavalidator;1"].createInstance(Components.interfaces.nsISchemaValidator);
       } catch(e){ alert(e) }
 
       var schemaLoader = Components.classes["@mozilla.org/xmlextras/schemas/schemaloader;1"]
@@ -316,4 +316,4 @@
   <tbody id="results" />
 </table>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/mozilla/extensions/schema-validation/tests/schema.html b/mozilla/extensions/schema-validation/tests/schema.html
index b427caf301f..e388f676b5b 100644
--- a/mozilla/extensions/schema-validation/tests/schema.html
+++ b/mozilla/extensions/schema-validation/tests/schema.html
@@ -117,7 +117,7 @@
       netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
 
      try{
-        myValidator = Components.classes["@mozilla.org/schemavalidator;1"].getService(Components.interfaces.nsISchemaValidator);
+        myValidator = Components.classes["@mozilla.org/schemavalidator;1"].createInstance(Components.interfaces.nsISchemaValidator);
 
       }catch(e){ alert(e) }
 
@@ -661,4 +661,4 @@
   <tbody id="results" />
 </table>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/mozilla/extensions/xforms/nsXFormsUtilityService.cpp b/mozilla/extensions/xforms/nsXFormsUtilityService.cpp
index 4084b89cd31..6d9b4d29720 100644
--- a/mozilla/extensions/xforms/nsXFormsUtilityService.cpp
+++ b/mozilla/extensions/xforms/nsXFormsUtilityService.cpp
@@ -217,7 +217,7 @@ nsXFormsUtilityService::GetMonths(const nsAString & aValue,
   *aMonths = 0;
   nsCOMPtr<nsISchemaDuration> duration;
   nsCOMPtr<nsISchemaValidator> schemaValidator = 
-    do_GetService(NS_SCHEMAVALIDATOR_CONTRACTID);
+    do_CreateInstance(NS_SCHEMAVALIDATOR_CONTRACTID);
   NS_ENSURE_TRUE(schemaValidator, NS_ERROR_FAILURE);
 
   nsresult rv = schemaValidator->ValidateBuiltinTypeDuration(aValue, 
@@ -251,7 +251,7 @@ nsXFormsUtilityService::GetSeconds(const nsAString & aValue,
 {
   nsCOMPtr<nsISchemaDuration> duration;
   nsCOMPtr<nsISchemaValidator> schemaValidator = 
-    do_GetService(NS_SCHEMAVALIDATOR_CONTRACTID);
+    do_CreateInstance(NS_SCHEMAVALIDATOR_CONTRACTID);
   NS_ENSURE_TRUE(schemaValidator, NS_ERROR_FAILURE);
 
   nsresult rv = schemaValidator->ValidateBuiltinTypeDuration(aValue, 
@@ -290,7 +290,7 @@ nsXFormsUtilityService::GetSecondsFromDateTime(const nsAString & aValue,
 {
   PRTime dateTime;
   nsCOMPtr<nsISchemaValidator> schemaValidator = 
-    do_GetService(NS_SCHEMAVALIDATOR_CONTRACTID);
+    do_CreateInstance(NS_SCHEMAVALIDATOR_CONTRACTID);
   NS_ENSURE_TRUE(schemaValidator, NS_ERROR_FAILURE);
 
   nsresult rv = schemaValidator->ValidateBuiltinTypeDateTime(aValue, &dateTime); 
@@ -378,7 +378,7 @@ nsXFormsUtilityService::GetDaysFromDateTime(const nsAString & aValue,
 
   PRTime date;
   nsCOMPtr<nsISchemaValidator> schemaValidator = 
-    do_GetService(NS_SCHEMAVALIDATOR_CONTRACTID);
+    do_CreateInstance(NS_SCHEMAVALIDATOR_CONTRACTID);
   NS_ENSURE_TRUE(schemaValidator, NS_ERROR_FAILURE);
 
   // aValue could be a xsd:date or a xsd:dateTime.  If it is a dateTime, we