Revert agg deletions
Fix accidental revertions