This reverts commit 13511a9c.

Change-Id: Ic5a91d14b59204c5667940797742bc55a137f177
Reviewed-on: https://chromium-review.googlesource.com/354706Reviewed-by: Frank Henigman <fjhenigman@chromium.org>