This reverts commit 426f5089. Reason for revert: there is nothing wrong with this cl Change-Id: I2f42bae6ba6b21206a1ea3ad243d4771c466ae97