Slightly outside the scope of this pull request, but could you set the number of paritions to something small for better performance here.  CC #857.