Use mapreduce_shuffle!  This is correct

Change-Id: I8d2bc6d79106b1875c893413406f1f66e5c15421