--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -687,17 +687,16 @@ pref("browser.safebrowsing.malware.enabl
 
 // Non-enhanced mode (local url lists) URL list to check for updates
 pref("browser.safebrowsing.provider.0.updateURL", "http://safebrowsing.clients.google.com/safebrowsing/downloads?client={moz:client}&appver={moz:version}&pver=2.2");
 
 pref("browser.safebrowsing.dataProvider", 0);
 
 // Does the provider name need to be localizable?
 pref("browser.safebrowsing.provider.0.name", "Google");
-pref("browser.safebrowsing.provider.0.lookupURL", "http://safebrowsing.clients.google.com/safebrowsing/lookup?sourceid=firefox-antiphish&features=TrustRank&client={moz:client}&appver={moz:version}&");
 pref("browser.safebrowsing.provider.0.keyURL", "https://sb-ssl.google.com/safebrowsing/newkey?client={moz:client}&appver={moz:version}&pver=2.2");
 pref("browser.safebrowsing.provider.0.reportURL", "http://safebrowsing.clients.google.com/safebrowsing/report?");
 pref("browser.safebrowsing.provider.0.gethashURL", "http://safebrowsing.clients.google.com/safebrowsing/gethash?client={moz:client}&appver={moz:version}&pver=2.2");
 
 // HTML report pages
 pref("browser.safebrowsing.provider.0.reportGenericURL", "http://{moz:locale}.phish-generic.mozilla.com/?hl={moz:locale}");
 pref("browser.safebrowsing.provider.0.reportErrorURL", "http://{moz:locale}.phish-error.mozilla.com/?hl={moz:locale}");
 pref("browser.safebrowsing.provider.0.reportPhishURL", "http://{moz:locale}.phish-report.mozilla.com/?hl={moz:locale}");

--- a/browser/components/safebrowsing/content/globalstore.js
+++ b/browser/components/safebrowsing/content/globalstore.js
@@ -37,17 +37,16 @@
 
 
 // A class that encapsulates data provider specific values.  The
 // root of the provider pref tree is browser.safebrowsing.provider.
 // followed by a number, followed by specific properties.  The properties
 // that a data provider can supply are:
 //
 // name: The name of the provider
-// lookupURL: The URL to send requests to in enhanced mode
 // keyURL: Before we send URLs in enhanced mode, we need to encrypt them
 // reportURL: When shown a warning bubble, we send back the user decision
 //            (get me out of here/ignore warning) to this URL (strip cookies
 //            first).  This is optional.
 // gethashURL: Url for requesting complete hashes from the provider.
 // reportGenericURL: HTML page for general user feedback
 // reportPhishURL: HTML page for notifying the provider of a new phishing page
 // reportErrorURL: HTML page for notifying the provider of a false positive
@@ -99,17 +98,16 @@ PROT_DataProvider.prototype.loadDataProv
   if (null == id)
     id = 0;
   
   var basePref = kProviderBasePref + id + '.';
 
   this.name_ = this.prefs_.getPref(basePref + "name", "");
 
   // Urls used to get data from a provider
-  this.lookupURL_ = this.getUrlPref_(basePref + "lookupURL");
   this.keyURL_ = this.getUrlPref_(basePref + "keyURL");
   this.reportURL_ = this.getUrlPref_(basePref + "reportURL");
   this.gethashURL_ = this.getUrlPref_(basePref + "gethashURL");
 
   // Urls to HTML report pages
   this.reportGenericURL_ = this.getUrlPref_(basePref + "reportGenericURL");
   this.reportErrorURL_ = this.getUrlPref_(basePref + "reportErrorURL");
   this.reportPhishURL_ = this.getUrlPref_(basePref + "reportPhishURL");
@@ -200,20 +198,16 @@ PROT_DataProvider.prototype.getLocalized
 PROT_DataProvider.prototype.getName = function() {
   return this.name_;
 }
 
 PROT_DataProvider.prototype.getUpdateURL = function() {
   return this.updateURL_;
 }
 
-PROT_DataProvider.prototype.getLookupURL = function() {
-  return this.lookupURL_;
-}
-
 PROT_DataProvider.prototype.getGethashURL = function() {
   return this.gethashURL_;
 }
 
 PROT_DataProvider.prototype.getReportGenericURL = function() {
   return this.reportGenericURL_;
 }
 PROT_DataProvider.prototype.getReportErrorURL = function() {

--- a/build/automation.py.in
+++ b/build/automation.py.in
@@ -318,17 +318,16 @@ user_pref("geo.wifi.testing", true);
 
 user_pref("camino.warn_when_closing", false); // Camino-only, harmless to others
 
 // Make url-classifier updates so rare that they won't affect tests
 user_pref("urlclassifier.updateinterval", 172800);
 // Point the url-classifier to the local testing server for fast failures
 user_pref("browser.safebrowsing.provider.0.gethashURL", "http://%(server)s/safebrowsing-dummy/gethash");
 user_pref("browser.safebrowsing.provider.0.keyURL", "http://%(server)s/safebrowsing-dummy/newkey");
-user_pref("browser.safebrowsing.provider.0.lookupURL", "http://%(server)s/safebrowsing-dummy/lookup");
 user_pref("browser.safebrowsing.provider.0.updateURL", "http://%(server)s/safebrowsing-dummy/update");
 """ % { "server" : self.webServer + ":" + str(self.httpPort) }
     prefs.append(part)
 
     if useServerLocations == False:
       part = """
 user_pref("capability.principal.codebase.p1.granted",
           "UniversalXPConnect UniversalBrowserRead UniversalBrowserWrite \