Back out 51ee43190135 (bug 1050770) for WinXP bc2 failures