Revert 8549a1008e90c9f4c1097b4aa13e31aeb941d618

Revert 8549a1008e90c9f4c1097b4aa13e31aeb941d618 that I cherry-picked
wrongly. Not needed as 1.5.4.x does not have a paged category list.