back to use kdm
sync with upstream