Bug 1018161 - Backed out changeset e0942119a8f8 due to safebrowsing failures

--HG--
branch : mozilla-beta