I merged master into staging-next but accidentally pushed it to master. This should get us back to87a19e9048. This reverts commitac241fb7a5, reversing changes made to76a439239e.
*** 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.