This reverts commit d8d96784.

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