@bcwaldon see https://github.com/coreos/fleet/pull/520 - if that looks better I'll rebase this on that and follow that behaviour.