Back out 5e4cee2fcbc6 (bug 963294) for build bustage
CLOSED TREE