It's included in @default now, since 14f4b1b5, and since @system-service pulls that in we can drop it from @system-service. Follow-up for #20191 (cherry picked from commit 67347f37) (cherry picked from commit 24243d8d)
