Backed out changeset 62d9d374cd0f (bug 1054409) for windows nonunified bustage