This reverts commit da66ed62.

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