This reverts commit 1545a60a8b78490c7dc8909b7012bca63dba63cd. Signed-off-by: Jinhua Cao <caojinhua1@huawei.com>