glad to see line 35-37 (which was the point of #2387);

I assume SERVICE_VARIANT is ensured to be (at least) lms/cms somewhere else now...