Reverted mistaken r7545

r7545 was a mistake due to not accounting for r7078 
Thanks Ramiro Morales for catching this.


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