Backout b817406485f8 (bug 884421) for intermittent WinXP failures (bug 896093)

CLOSED TREE