This reverts commit f4162593. Exempt-From-Owner-Approval: Reverting Bug: 110883880 Test: Chrome no longer crashes Change-Id: I70c9d4a0376b27059e7759e1b6283903c0cf168b