Revert from mapreduce to aggregate

that sounds perfect