Backed out changeset 5ad19343465f (bug 883498)