This reverts commit 60e62d17. Reason for revert: Commit 7fd36d1 was reverted Change-Id: I23c9d6dcdc1f03991cf55bdea1897e6e8a4160f0