This reverts commit e408d1df and 2 other (4b25c113 and c2deb2af) related to fix the problem with the reordering shuffles.