Follow-up to bug 874869: Clobber the builds, because the build system sucks

Landed on a CLOSED TREE