Backed out changeset eb7402ddbe54 (bug 873622) for Windows bustage.
CLOSED TREE