Reverted changeset [14356]
Reverted changeset [14356]

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

Refs #14565

git-svn-id: 554f83ef17aa7291f84efa897c1acfc5d0035373@14376 bcc190cf-cafb-0310-a4f2-bffc1f526a37

svn2github/django,svn2github/django,svn2github/django