Revert "Merge 'kk' into kk"

This reverts commit 0fc27a43c348c68f9bce928dd039c55fe989276d, reversing
changes made to f261be7344754327e289240f84cae2c54ef1075d.