apparently this feature got lost in the migration to exec'ing daemons. Change-Id: Iac9425cf6d20781bb49e5cf12f2056f4a3ec23ba