This reverts commit c53018c9. This causes problems for "nix-env -qa", so we'll have to come up with a clean solution first. Issue #9456.