Reconciled Li's commit from 13 Aug.