Revert "Fix product paging issue"

This reverts commit 969dcc6e3458140e3abed414422130f4bff3ba04.