PROTON-749: Fix erroneous windows change due to previous version to changeset.
PROTON-749, PROTON-750: Merge these changes into development stream.