Revert to Huynh's commit