Post-merge: you probably also need to remove django.contrib.sites now that SITE_ID is gone?