Merge "Revert "Don't add a symlink for killall --- it's broken.""