This reverts commit f30a9ba9.

Change-Id: I577cfd1e7d5d6138413c29205cbf4d35b6861226
Reviewed-on: https://chromium-review.googlesource.com/263754Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Tested-by: Corentin Wallez <cwallez@chromium.org>