Reinstate recursive aggregation object code

[lucasxia01]

During the rollup integration process, we commented out and removed recursive aggregation code, so we should reinstate it.