9e9e240a27
This reverts commit 2dbd08dcbd5fa78d6716aa1fbdfb04be175e4162. I've fixed the regression in 8a7a8442c17 and the rest of my refactorings/improvements shouldn't affect the stability of the test.
*** NixOS *** NixOS is a Linux distribution based on the purely functional package management system Nix. More information can be found at https://nixos.org/nixos and in the manual in doc/manual.