Revert to normal pagination, get rid of pageless malarky