Revert "reshuffle"

This reverts commit 6249fd3d02dd73a91b2b65552a2ec66168823fea.