Revert "All in one entropy tweaks, thanks to Temasek"

This reverts commit ab32095b680a3f4e4ae84302c31ad72f612ad5c1.