Simplify partialShuffle
Merge pull request #2430 from lgvz/shuffle

Simplify partialShuffle