bug:29089267 bug:27521545 Fails some DHECKs. This reverts commit 80806733. Change-Id: I0e768ce85be593e3f50fd02abc29aa34f2be3562