Revert "chitieu8"

This reverts commit 85c9d4ee8cb87420729f5d40618c09c2e596c4ed.
Revert "chitieu7"

This reverts commit 05644784f0951cacd499e26aa856010791324946.