Merge "Revert "systemd: Always create the systemd unit files""