Revert "20140304_yilun"

This reverts commit fdc0f0fa20f1d9cd2b6320ffc42af73ca4225098.