This is a hack until the daemon and client jobs are merged