mostly revert 4a6ff3bc1722677e4fcb6e6fb9fdff729c067ad6

Change-Id: I66afa815b8af08c9142f897e95f307e17193386b