This reverts commit 259ce717. Reason for revert: Needs reviewed Change-Id: Ib8fe9df5b4dd573343b22703b5013db38e207189