This reverts commit b0df9137.

Signed-off-by: Andrei Gherzan <andrei.gherzan@huawei.com>