--- a/js/xpconnect/loader/XPCOMUtils.jsm
+++ b/js/xpconnect/loader/XPCOMUtils.jsm
@@ -562,49 +562,8 @@ var XPCOMUtils = {
 var XPCU_lazyPreferenceObserverQI = XPCOMUtils.generateQI([Ci.nsIObserver, Ci.nsISupportsWeakReference]);
 
 ChromeUtils.defineModuleGetter(this, "Services",
                                "resource://gre/modules/Services.jsm");
 
 XPCOMUtils.defineLazyServiceGetter(XPCOMUtils, "categoryManager",
                                    "@mozilla.org/categorymanager;1",
                                    "nsICategoryManager");
-
-// FIXME: Remove this when Android hostutils is updated to support
-// ChromeUtils.generateQI.
-if (ChromeUtils.generateQI) {
-  XPCOMUtils.generateQI = function(interfaces) {
-    return ChromeUtils.generateQI(interfaces.filter(i => i && i.name != "nsISupports"));
-  };
-} else {
-  /**
-   * Helper for XPCOMUtils.generateQI to avoid leaks - see bug 381651#c1
-   */
-  let makeQI = (interfaceNames) => {
-    return function XPCOMUtils_QueryInterface(iid) {
-      if (iid.equals(Ci.nsISupports))
-        return this;
-      if (iid.equals(Ci.nsIClassInfo) && "classInfo" in this)
-        return this.classInfo;
-      for (let i = 0; i < interfaceNames.length; i++) {
-        if (Ci[interfaceNames[i]].equals(iid))
-          return this;
-      }
-
-      throw Cr.NS_ERROR_NO_INTERFACE;
-    };
-  };
-
-  XPCOMUtils.generateQI = function(interfaces) {
-    /* Note that Ci[Ci.x] == Ci.x for all x */
-    let a = [];
-    if (interfaces) {
-      for (let i = 0; i < interfaces.length; i++) {
-        let iface = interfaces[i];
-        let name = (iface && iface.name) || String(iface);
-        if (name in Ci) {
-          a.push(name);
-        }
-      }
-    }
-    return makeQI(a);
-  };
-}