Speculative fix for failures on the AMD FYI bot.

This reverts commit 67e04be1.

Change-Id: Ia57e3c800a6ff9e81e31bf5b37a95e97460ceda4
Reviewed-on: https://chromium-review.googlesource.com/277681Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>