#405 Reverse changes to shuffle, too much negative feedback