This reverts commit dfa2fe31.

Change-Id: If4a7eb1876876991c537d0a9077cede52ba40b95
Reviewed-on: https://chromium-review.googlesource.com/316621Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>