wip: re-enable token aggregation