revert the upstream systemd changes; final integration pending