Back out a12e6c2e9535 (bug 972327) for not actually building
CLOSED TREE