Revert r922.
Revert r922.

We had a 10% build performance regression on the Chrome Windows builders,
and this seems likely to be related.

Review URL: http://codereview.chromium.org/7027034
old8xp/gyp_from_google,old8xp/gyp_from_google,old8xp/gyp_from_google,old8xp/gyp_from_google,old8xp/gyp_from_google