Revert from mapreduce to aggregate

This could probably use a rename