Backing out aa94c4753dcc (Bug 915002) due to WinXP breakage