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