This reverts commit 87a562ce. Bug: 110883880 Test: Chrome no longer crashes Change-Id: I81d97298cbfd7f947920b6e9e8ad3abcd1a0d75a