Revert not finished 1000 limitation fix commit (ef7222d484). We are going to put this into separate branch until it's finished.

[nosetests]
exclude=django