Revert from mapreduce to aggregate

:+1:  That works. Feel free to push that change to the branch. If not, I'll get it later.

NOTE: This only works for top level properties (no dot notation support). We could add that pretty easily though.