Back out 3df94ef87444 (bug 999266) for build bustage
CLOSED TREE