Reverted r16662 -- There are bunch of problems with this patch, including failing tests, that I didn't pick up before committing.

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