Close #169965: the PR and real 'staging-next' branch contained extra systemd rebuild that I wanted to avoid in this iteration. (to save Hydra's work)