Revert "Django 1.6 compatibility"

This reverts commit f207ab4a007b42b6d16269b0aa732bac97f48364.