Undo changes that broke pagination on the public side.