Reverted to old pagination style