This reverts commit 489e5df9. Bug: 110883880 Test: Chrome no longer crashes Change-Id: I1022ad2ccc647f35fc074422c538e39613be43c2