Fixing server with non-gdm, take 2.