This reverts commit 6d41de38 as the windows bots are not happy, in a way I do not understand. Revert whilst we figure out what is wrong.