Remove local shuffle, partial fix #1090

should improve consistency of behavior.
Merge pull request #1100 from Soul1355/master

Remove local shuffle, partial fix #1090