refactor away direct references to daemon member Upstream-commit: 6e12d9fe62f201dac221be5064e743f59f9a1953 Component: engine