Fixed merge from Fang's stuff.
Revert "Fixed merge from Fang's stuff."

This reverts commit 48a00bc6f28e9e4ad669ee21c2e60d369f97aca4.
Fixed merge from Fang's stuff.