Backout changeset 1c7bf97d3b6f (bug 854085) for bustage