Backout of changeset 816f076c2c15
merge