Merge "Reimplement remove(3) without the lstat(2)."