At this point I'm suggesting we remove both of these new functions.  Which means no need to update KVM.