Revert "Merge pull request #138 from haplo/django-1.3-fixes"

This reverts commit 267b961aee3ef342395599849111115867d039fb, reversing
changes made to fc6fff3908b791b515d1a69f6c4a9d94475fa605.