Revert "Update from https://crrev.com/304418"

This reverts commit 587d4b83fa8ec650e9574801c15bf30da9857d6e.

This breaks the windows build.

Review URL: https://codereview.chromium.org/738433002