Revert on Nix-1.7