This reverts commit 723c61cf.

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