Default media sites will be reinstalled on uninstallation. That slightly sucks for people who don't want them, let's hope they're entirely theoretical.
@Martok You should probably revert the changes you applied manually before upgrading. They can be found in the Admin CP by entering "Customized Components" in the search box.