Backed out changeset 8b44017765ac (bug 1045975) for Windows non-unified bustage.
CLOSED TREE