This reverts commit 2282a577, reversing changes made to 14adea91. The lib tests are bloking nixpkgs-unstable, and I don't like debugging it soon enough.
