Imported another diff from gusi to fix XDG launch problem.