Revert the previous commit r1.219 and use "rm -f" again