backport files/ symlink overwrite fix from r25078