revert A few kk changes