Reverted [8481] and [8482] while we work out what is going on with #8453 and...

Reverted [8481] and [8482] while we work out what is going on with #8453 and the related discussions that I wasn't previously aware of.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@8486 bcc190cf-cafb-0310-a4f2-bffc1f526a37