Merge "Fix how we delete the symlink" into main