Causing failures on Windows 8 bots running ES CTS and Windows 7 Intel bot running angle tests.

Example failures:
https://build.chromium.org/p/chromium.gpu.fyi/builders/Win8%20Release%20%28NVIDIA%29/builds/14442
https://build.chromium.org/p/chromium.gpu.fyi/builders/Win7%20Release%20%28Intel%29/builds/11627

This reverts commit d63f08fc.

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