Seems to break VS2013. Reverting.

This reverts commit 51e275b4.

Change-Id: I37843bf457122614007ba455f6ee751577b14604
Reviewed-on: https://chromium-review.googlesource.com/296290Reviewed-by: Jamie Madill <jmadill@chromium.org>
Tested-by: Jamie Madill <jmadill@chromium.org>