Recommit r132764 since it didn't cause the windows buildbot failures.