Causing crashes on windows.

This reverts commit dfa569e6.

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