This reverts commit fd8c6da6, reversing
changes made to acdab8e8.
Signed-off-by: Nyangwenjun <yangwenjun13@huawei.com>