Back out 26f0d590a021, d92e88a18263, 5a2d12a34466 (bug 846995) for not building
CLOSED TREE