Hi @adam-vessey! I made revisions to this PR last Wednesday and added a comment explaining why I think the patch is still necessary and why our previous course of action isn't going to work. Any chance you could review this bug fix one last time before the 2pm code freeze? This is one of the last Windows-related PRs to merge for 7.x.1.3.