a60b2feb5f
Windows build fails for some reason. Needs to be investigated later This reverts commit 812f00eb81158bfb4c2d61b228c0c1c796641ac1.