Backed out changeset 36e95068e103 (bug 1848160) for bc failures on browser_preference...