Backout fc9733225130 (bug 784739) for breaking VS2012 builds

While VS2012 isn't tier-1 platform, a significant number of Windows
developers rely on it and have complained about this issue.