revert of previous commit

Change-Id: I1a6613047fc7bd0d7bfd7e4eed405e0fdbc98257