r14145: Add missing WITH_KCM hunks from my local tree.