diff --git a/content/xslt/src/xpath/txXPCOMExtensionFunction.cpp b/content/xslt/src/xpath/txXPCOMExtensionFunction.cpp
index f590e72af2d4..83e182e80732 100644
--- a/content/xslt/src/xpath/txXPCOMExtensionFunction.cpp
+++ b/content/xslt/src/xpath/txXPCOMExtensionFunction.cpp
@@ -191,13 +191,10 @@ private:
 
 static nsresult
 LookupFunction(const char *aContractID, nsIAtom* aName, nsIID &aIID,
-               PRUint16 &aMethodIndex, nsISupports **aHelper)
+               PRUint16 &aMethodIndex)
 {
     nsresult rv;
-    nsCOMPtr<nsISupports> helper = do_GetService(aContractID, &rv);
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    nsCOMPtr<nsIClassInfo> classInfo = do_QueryInterface(helper, &rv);
+    nsCOMPtr<nsIClassInfo> classInfo = do_GetClassObject(aContractID, &rv);
     NS_ENSURE_SUCCESS(rv, rv);
 
     nsCOMPtr<nsIInterfaceInfoManager> iim =
@@ -255,7 +252,8 @@ LookupFunction(const char *aContractID, nsIAtom* aName, nsIID &aIID,
 
             aIID = *iid;
             aMethodIndex = methodIndex;
-            return helper->QueryInterface(aIID, (void**)aHelper);
+
+            return NS_OK;
         }
     }
 
@@ -270,10 +268,11 @@ TX_ResolveFunctionCallXPCOM(const nsCString &aContractID, PRInt32 aNamespaceID,
 {
     nsIID iid;
     PRUint16 methodIndex;
-    nsCOMPtr<nsISupports> helper;
+    nsresult rv = LookupFunction(aContractID.get(), aName, iid, methodIndex);
+    NS_ENSURE_SUCCESS(rv, rv);
 
-    nsresult rv = LookupFunction(aContractID.get(), aName, iid, methodIndex,
-                                 getter_AddRefs(helper));
+    nsCOMPtr<nsISupports> helper;
+    rv = CallGetService(aContractID.get(), iid, getter_AddRefs(helper));
     NS_ENSURE_SUCCESS(rv, rv);
 
     if (!aFunction) {
diff --git a/content/xslt/src/xslt/txEXSLTRegExFunctions.js b/content/xslt/src/xslt/txEXSLTRegExFunctions.js
index bb3dfb9a087a..a6620e1cd51a 100644
--- a/content/xslt/src/xslt/txEXSLTRegExFunctions.js
+++ b/content/xslt/src/xslt/txEXSLTRegExFunctions.js
@@ -50,31 +50,22 @@ function txEXSLTRegExFunctions()
 {
 }
 
+var SingletonInstance = null;
+
 txEXSLTRegExFunctions.prototype = {
-    classID: EXSLT_REGEXP_CID,
+    classID: Components.ID("{18a03189-067b-4978-b4f1-bafe35292ed6}"),
 
-    QueryInterface: XPCOMUtils.generateQI([Ci.txIEXSLTRegExFunctions,
-                                           Ci.nsIClassInfo]),
+    QueryInterface: function(iid) {
+        if (iid.equals(Ci.nsISupports) ||
+            iid.equals(Ci.txIEXSLTRegExFunctions))
+            return this;
 
-    // nsIClassInfo
-    getInterfaces: function(countRef) {
-        var interfaces = [
-            Ci.txIEXSLTRegExFunctions
-        ];
-        countRef.value = interfaces.length;
+        if (iid.equals(Ci.nsIClassInfo))
+            return txEXSLTRegExModule.factory
 
-        return interfaces;
+        throw Components.results.NS_ERROR_NO_INTERFACE;
     },
 
-    getHelperForLanguage: function(language) {
-        return null;
-    },
-
-    implementationLanguage: Ci.nsIProgrammingLanguage.JAVASCRIPT,
-    flags: 0,
-
-
-    // txIEXSLTRegExFunctions
     match: function(context, str, regex, flags) {
         var nodeset = Components.classes[NODESET_CONTRACTID]
                                 .createInstance(Ci.txINodeSet);
@@ -110,6 +101,38 @@ txEXSLTRegExFunctions.prototype = {
         var re = new RegExp(regex, flags);
 
         return re.test(str);
+    },
+
+    _xpcom_factory: {
+        QueryInterface: XPCOMUtils.generateQI([Ci.nsIFactory,
+                                               Ci.nsIClassInfo]),
+
+        createInstance: function(outer, iid) {
+            if (outer != null)
+                throw Components.results.NS_ERROR_NO_AGGREGATION;
+
+            if (SingletonInstance == null)
+                SingletonInstance = new txEXSLTRegExFunctions();
+
+            return SingletonInstance.QueryInterface(iid);
+        },
+
+        getInterfaces: function(countRef) {
+            var interfaces = [
+                Ci.txIEXSLTRegExFunctions
+            ];
+            countRef.value = interfaces.length;
+
+            return interfaces;
+        },
+
+        getHelperForLanguage: function(language) {
+            return null;
+        },
+
+        classID: EXSLT_REGEXP_CID,
+        implementationLanguage: Ci.nsIProgrammingLanguage.JAVASCRIPT,
+        flags: Ci.nsIClassInfo.SINGLETON
     }
 }
 
diff --git a/content/xslt/tests/mochitest/Makefile.in b/content/xslt/tests/mochitest/Makefile.in
index bdb067c6f7e2..26cc770bd6a5 100644
--- a/content/xslt/tests/mochitest/Makefile.in
+++ b/content/xslt/tests/mochitest/Makefile.in
@@ -52,7 +52,6 @@ _TEST_FILES = 	test_bug319374.xhtml \
 		test_bug511487.html \
 		test_bug551412.html \
 		test_bug551654.html \
-		test_exslt_regex.html \
 		$(NULL)
 
 libs:: $(_TEST_FILES)
diff --git a/content/xslt/tests/mochitest/test_exslt_regex.html b/content/xslt/tests/mochitest/test_exslt_regex.html
deleted file mode 100644
index 25056f3b1bea..000000000000
--- a/content/xslt/tests/mochitest/test_exslt_regex.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-Test EXSLT Regular Expression Extension
-http://www.exslt.org/regexp/index.html
--->
-<head>
-  <title>Test for EXSLT Regular Expression Extensions</title>
-  <script type="application/javascript" src="/MochiKit/packed.js"></script>
-  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
-</head>
-<body>
-<p id="display"></p>
-<div id="content" style="display: none"></div>
-<pre id="test">
-<script type="application/javascript">
-  var tests = [
-    { descr: "Testing regexp:test",
-      expr: "regexp:test('XSLT is great', 'XSLT', '')",
-      expResult: "true" },
-      
-    { descr: "Testing regexp:match",
-      expr: "regexp:match('XSLT is great', 'XSL.', '')[1]",
-      expResult: "XSLT" },
-      
-    { descr: "Testing regexp:replace",
-      expr: "regexp:replace('Food is great', 'Fo.d', '', 'XSLT')",
-      expResult: "XSLT is great" }
-  ];
-  
-  for each(test in tests) {
-    var style =
-      '<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" ' +
-                      'xmlns:regexp="http://exslt.org/regular-expressions" '+
-                      'version="1.0">' +
-        '<xsl:output method="html"/>' +
-        '<xsl:template match="/">' +
-          '<xsl:value-of select="'+test.expr+'" /> ' +
-        '</xsl:template>' +
-      '</xsl:stylesheet>';
-    var styleDoc = new DOMParser().parseFromString (style, "text/xml");
-
-    var data = '<root/>';
-    var originalDoc = new DOMParser().parseFromString(data, "text/xml");
-
-    var processor = new XSLTProcessor();
-    processor.importStylesheet(styleDoc);
-
-    var fragment = processor.transformToFragment(originalDoc, document);
-    var content = document.getElementById("content");
-    content.appendChild(fragment);
-    is(content.innerHTML, test.expResult, test.descr);
-
-    content.innerHTML = '';
-  }
-
-</script>
-</pre>
-</body>
-</html>