This commit reverts f44c4a5d and 39bbd165.

django.test.simple will be updated in a separate commit as it requires
invasive changes.