Backed out changeset fddde2d1e9b2 (bug 853858) for Windows leaks.