Back out a4b51aff4b3c (bug 957928) for build bustage
CLOSED TREE