Remove local shuffle, partial fix #1090

should improve consistency of behavior.