Causing issues on AMD and Intel bots.

This reverts commit 6d892669.

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