This reverts commit d9f0ec41. Bug: 110883880 Test: Chrome no longer crashes Change-Id: I57d08a33a392394bd0a2cf4d7af97a3cce7ed8f5