This reverts commit 7e840863. Reason for revert: No Longer needed. Change-Id: Id6a3c66908a0b7b2e6a666f86f30ce05d3964b4b