Revert "get rid of entropy for the time being"

This reverts commit da810ff6e2dcae80df67411a9cda80d726daad46.