Revert "Krittapat-JingJing"

This reverts commit 254798d864517e3de35c059435b970b674ff07d1.