Revert "change by Quang"

This reverts commit d9f5edeb0ce379275d6be895a68b1c990cbc52d1.
Revert "adasdaf"

This reverts commit d28429c0ce316e536be11732e470bdb660331264.