Fix upstream bug, preventing start-on-demand dbus service from working