Back out bbb44c125553 (bug 940393) for breaking WinXP