This reverts commit acdab8e8, reversing
changes made to 412ca9eb.
Signed-off-by: Njiangkuaixue <jiangchenzhou@huawei.com>