This reverts commit c53c87621fc553ba96174f97dcdaf540a516d94c. Change-Id: I616ad7c631b72ebd704cce1ab4a6d5f1ca188285