
This reverts commit 29caa185a7e4aaa0d621a4f117f3e8f653261fda. Not clear what the proper thing to do is. cf94cdb59b renders this question mostly moot. Reverting before 17.03 branch to avoid a repeat of #19054.
*** NixOS *** NixOS is a Linux distribution based on the purely functional package management system Nix. More information can be found at http://nixos.org/nixos and in the manual in doc/manual.