Now working with systemd 210.
Merged with upstream.