Backed out changesets 2b47c18653da and b9d17aa000e7 (bug 854614) for Windows bustage on a CLOSED TREE.