See #490 discussion. This reverts commit 1278859d, reversing changes made to 0c020c98. Conflicts: pkgs/desktops/xfce/core/xfce4-session.nix (take master) pkgs/lib/misc.nix (auto)