Doing the needful: removing my customizations from the main codebase and going back to something that resembles the original, but works in Django 1.5