Revert "Pham Duy Khang commit"

This reverts commit ba4c479765c8acb4e1f655f40731586c27d6eeb6.