Touch CLOBBER after bug 957965 landed
Unback out and reland changeset a1223ec7312a (bug 987026) because it wasn't at fault for the mochitest failures on a CLOSED TREE