This reverts commit 2c4e68a86b7a9b9f760a8907b93ff40ccad56c80. Change-Id: I98c91343d886ebe22d0bf75a710fa0b0abf738b6