This reverts commit 3117e0c8. Conflicts: pkgs/development/libraries/wayland/default.nix pkgs/servers/samba/4.x.nix