Backed out changesets 37e7cae3d8c8 and 3ccbb670a699 (bug 898963) for Windows debug bustage.
CLOSED TREE