Back out b831500ca4be (bug 837714) for bustage
CLOSED TREE