Revert "17/4 Tân update"

This reverts commit f28563891adee0630aede3f1956287c34f2fd1f7.
Tân revert 17/4

Revert lại code