This reverts commit 8b8d0432.

Change-Id: I25726642d066ca322830d1f5a4327f4e7e551fa6
Reviewed-on: https://chromium-review.googlesource.com/350870Reviewed-by: Geoff Lang <geofflang@chromium.org>
Commit-Queue: Geoff Lang <geofflang@chromium.org>