Use of a flag doesn't make it easy to share code, especially with the systemd units. (cherry picked from commit d3adf06c)