Get rid of DESKTOP_SESSION hacks