This reverts commit 4b1c75d7. Reason for revert: Breaks on go/lem Change-Id: I4ec7d07ab8bd8b03355b61d4548f5de1a318fff7