revert django-1.6-dependent code committed too soon