Backed out changeset 0d2f538bddde (bug 1036284) for Windows 7 bc1 crashes.