This reverts commit 4251b758.

Change-Id: I95afebcaf91ee38a121df20f403eb06f19b2510a
Reviewed-on: https://chromium-review.googlesource.com/190560Reviewed-by: Shannon Woods <shannonwoods@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>