[1.2.X] Reverted changeset [14356]

That fix for #14565 introduced test failures.  A better fix will
follow shortly.

Refs #14565

Backport of [14376] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14379 bcc190cf-cafb-0310-a4f2-bffc1f526a37