Revert "ref Task #8454 change paginate"

This reverts commit d7a239d36ff93ed417bd2675e1e203a1529a7772.