Revert r164763 because it introduces new shuffles.