Revert "Revert "Revert "Shuffle detection #2064"""