Revert "Fixed use of create_kpvs_at_ktis"

This reverts commit 48252fc7be1e2903b813cf39eb723432a5eeaa46.