Backed out changesets e6a3b0532422:f37447f59817 (bug 908880, bug 879682) for Windows assertion failures.