This reverts commit ccc25bfe4f. https://groups.google.com/d/topic/django-developers/GVHMH2ciAnk/discussion
ccc25bfe4f