Backout changeset 237c32279481 (bug 914482) for bustage