Revert while investigating. bug:35977033 This reverts commit e6316892. Change-Id: I51e24a6e539072a6d0d470dfe41855a4847f3e96