Vogar has been fixed. bug:35308152 This reverts commit b1cde6a6. Change-Id: I2440da0a97561f6794f8827b536481e1a6536c91