Reverting back to older code

Revert "blew away code with a pointer to official repo", because the
official repo is not backward compatible.

This reverts commit 28837ea1fcf67a9a544db02a5379fdf668687546.
Fix for Django-1.4+