This reverts commit 2df979ed.

Change-Id: Iff4ec858b8f42a4749cfc55749eb8f57b419f98f
Reviewed-on: https://chromium-review.googlesource.com/311271Tested-by: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Tryjob-Request: Corentin Wallez <cwallez@chromium.org>