Revert "Merged Chuong's branch"

This reverts commit 73d544310b7d5390cfa76ea138b37c4836fa7f25.