Backed out changeset b4c58f7a3d4b (bug 1039950) for Windows warnings as errors failures