Do as 2 sets. Revert "Django 1.5 changes"

This reverts commit 80154ac00bf32a757a3927b6fa71be897c51bc4a.