The commit breaks windows build and brings some test failures that needs to be debugged. This reverts commit d790f612.