No bug. Remove .orig files, r=njn, DONTBUILD