This reverts commit 565759fe2df8d553e8d8910e9d7f2032e9c9355c.
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>