from systemd: build: merge trivial changes back