The patch order is messed up, because I committed the patches to systemd-stable in the wrong order. Sorry.