Causes errors in Clang-Win. We can fix the error and then resubmit, but need to do a roll now.

This reverts commit 31018486.

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