Backed out changeset 84db7473edfb (bug 835575)