This reverts commit 82075205.

Change-Id: I6f54c350786d01d348d8e08d650943b22beafba6
Signed-off-by: Timple Raj M <quic_timple@quicinc.com>