This reverts commit 22c96b0a, reversing
changes made to 8ab18ce0.
Signed-off-by: Nlaiguizhong <laiguizhong@huawei.com>