reverted changes not possible with django 1.4/1.5, #395