Reverted changeset [14356]
Reverted changeset [14356]

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

Refs #14565

git-svn-id: 4f9f921b081c523744c7bf24d959a0db39629563@14376 bcc190cf-cafb-0310-a4f2-bffc1f526a37

django-nonrel/django-nonrel,jamespacileo/django-france,disqus/django-old,skevy/django,jamespacileo/django-france,jamespacileo/django-france,Instagram/django,django-nonrel/django-nonrel,mitsuhiko/django,disqus/django-old,Instagram/django,skevy/django,mitsuhiko/django,Instagram/django,disqus/django-old,mitsuhiko/django,django-nonrel/django-nonrel,skevy/django