Forgot to hg rm the files that changeset 0616a4ae8aa2 (bug 842681) had added. DONTBUILD