Backed out changeset 824da93333e7 (bug 1065130) for bustage