Revert r164763 because it introduces new shuffles.
Thanks Nick Lewycky for pointing this out.