Back out ef1cd14c8cac (bug 1067455) for Windows assertion failures
CLOSED TREE