Revert to normal pagination from pageless, refs #75