Back out 74728e99dc47 (bug 1049290) for causing the same hazard build timeouts it caused on Try
CLOSED TREE