Back out 53e5f619cb62 (bug 1025497) for build bustage
CLOSED TREE