some changes were meant for Django < 1.3. So, reverting back