Backed out changesets e41b160a4ada and 90624f34525a (bug 912891) on the suspicion of turning bug 934852 into a perma-fail on WinXP debug.