This reverts commit 1ab0ed29. Reason for revert: Fixed Change-Id: I7baacba6dced16bdcaecb0edec14e7fbcb5d4b30