More performant windows fix.

This will roll back into _085 since it was not released yet