This reverts commit d75a03b7. Reason for revert: Adding functionality differently Change-Id: I90ac64c89566589797f1ad0bf69fefee3fbd04e1