This CL is breaking some internal builds. This reverts commit 726931eb. Change-Id: Ie79214808d84c73f54a525f515b4c90a3fb23542