Revert "More conservative shuffle timing"

This reverts commit f8aa7b6a1ffdcd1bc0c867d97582e0b84609419a.