Going to try reverting this as a potential fix to failures seen on the bots.  Can re-land in the morning if the failures don't clear up.

Failures seen on all windows bots now.

This reverts commit 15ca8296.

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