Fixed #12239, again: Refined the original fix to avoid the test errors...

Fixed #12239, again: Refined the original fix to avoid the test errors introduced.  Thanks pmclanahan.


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