This reverts commit 9fc51d90.

Change-Id: I4134ebe5ef6b8f509f4cc5cc22a2d526ec43ef6d
Reviewed-on: https://chromium-review.googlesource.com/226374Reviewed-by: Shannon Woods <shannonwoods@chromium.org>
Tested-by: Shannon Woods <shannonwoods@chromium.org>