Systemd has fixed this on master, but I don't want to meddle with the patch that doesn't apply cleanly on our version.