Issue #995 (paging; API changed back)