Revert "Made generators store their values and shuffle optionally"

This reverts commit 42653f39e2ebd9d8a998fa2cf2ad587f1ce3c587.