Hopefully restored build on windows