Failures on AMD and Intel bots.

This reverts commit e1bb74e7.

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