Revert "Merge upstream changes kk/kk"

This reverts commit 880385d0342f5df3ed2198c0fe68dc9027f2695f.