Revert "Khang-commit"

This reverts commit f14e41408ab74a7fb7f48ecc8ab339e0d8e92332.