This partially reverts commit e7ae6445. Bug: 11790271 Change-Id: Ib83dbede4472ba08bcf79bf9009d690278841723