This reverts commit e7c9e570. Reason for revert: wip Change-Id: If03c88b17fd02f740e8a9b01b18768cc328533bf
