Revert "Revert "Kir""

This reverts commit 6ad7ae476334a52a967532a14d51e5a6c7a790ac.