Revert "Merge pull request #1333 from dimagi/django-1.5-compat"

This reverts commit 41752d0de79a0b7761b532c4edeccbf1e7c8772b, reversing
changes made to 3f27a420f3ae2f6f3c3a0c2cec48af2d423b5496.
Merge pull request #1355 from dimagi/revert_django-1.5-compat

Revert "Merge pull request #1333 from dimagi/django-1.5-compat"