Back out b21345c5027c (bug 843868) for build bustage
CLOSED TREE