IMO this is currently not needed, since ... we still have UPS/KC as one install.

RHMAP-3329 talks about UPS/KC decoupling, just adding as a reference...