Build failures on bots. Investigating. This reverts commit fa2c054b. Change-Id: Id65b2009aa66cb291fb8c39758a58e0b0d22616c