This reverts commit 03510421.
Failures on Windows bots are consistent after landing this.

TBR=fbarchard@google.com
NOTRY=True

Change-Id: Ie249aafde2204297aa2d86ecb1dec6e109685493
Reviewed-on: https://chromium-review.googlesource.com/435261
Commit-Queue: Henrik Kjellander <kjellander@chromium.org>
Reviewed-by: Henrik Kjellander <kjellander@chromium.org>