These commits were reverted because they cause the low entropy check to trigger inside a chroot test environment. Reverting is certainly not the correct fix for the problem, but this needs to be looked at in more detail when Jimis is back, so it's good enough for now.
Possible proper fixes include:
- We may be missing a source of entropy inside the chroot, so it may be possible to tweak it to gain access to that source.
- If it's not possible to generate enough entropy inside the chroot, we may need to skip the strict entropy check inside the test environment.