Backed out changeset 7675ce645b75 (bug 1082986) for bustage.