Thread: rollback change in #8070 as this includes a regression on windows XP.

From [84946], by viboes.