Minor changes to keywords and use
Mask >=systemd-202 until X11 fixed