Fix bug 20936 in shuffle sides by reverting d49b183fb1252d913b8ca8afdbc0feec885b793f.