Back out f21835504604 (bug 860338) for build bustage
CLOSED TREE