This reverts commit 01e994d7.

Change-Id: Ie76710d0f4e641e071889c5125fd3be23cdcdb59
Reviewed-on: https://chromium-review.googlesource.com/758499Reviewed-by: Frank Barchard <fbarchard@google.com>