This was not working as intended. The correct fix was implemented in
44492266

This reverts commit 74b92323.

Change-Id: Ib2bc3861bcdb49555b59981ca95f1c1c1e924d7d
Reviewed-on: https://chromium-review.googlesource.com/320480
Tryjob-Request: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>