Fixes #3447, Refs #2160 -- Reverting change [4459] because it breaks admin. Apologies for the inconvenience, guys.
Fixes #3447, Refs #2160 -- Reverting change [4459] because it breaks admin. Apologies for the inconvenience, guys.


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

FlaPer87/django-nonrel,FlaPer87/django-nonrel,aparo/django-nonrel,aparo/django-nonrel,FlaPer87/django-nonrel,aparo/django-nonrel