Backed out commit 80ce90dbc266, this causes Visual Studio build failure on buildbot
1 file changed