BHV-10367: reverting to earlier commit because some issues discovered
Enyo-DCO-1.1-Signed-off-by: Krishna Rangarajan <krishna.rangarajan@lge.com>