Backed out changeset e9530cf2baed (bug 890597) for Windows Werror bustage.