Revert "fixed the Pagenation issue"

This reverts commit e7ac95c4d14bbb3adc233992bcabf21a47053e08, reversing
changes made to fa2030142ffcc9d62aa080d8717976f13433c9e0.