Revert "Doan Van Luan Commit"

This reverts commit da35a4b7dbf96f6017625b899e5109f9b42449ea.