This reverts commit 2bb451e76d922861673e052f5f889658ac7db15f. Change-Id: I1deada59a291a96ef88c8b9b4f2b28861ad27347 Signed-off-by: Venevtsev, Igor <igor.venevtsev@intel.com>