Deactivate some code which tests for name clashes with Django 1.7