Merge "Revert "Add cp(1) symlink.""