This reverts commit 2a0e16d0. Reason for revert: Causes chrome buildbots to break. Change-Id: I9c9d02e37d20fbf423e73e166616d8e714dfdf18