Revert behavior from #463 on Windows.
Revert behavior from #463 on Windows.

See PR for discussion. Due to os specific issues, we can't fix the bug
from #463, as it causes other problems on windows

tolbertam/ccm,mikefero/ccm,bcantoni/ccm,pcmanus/ccm,mike-tr-adamson/ccm,pcmanus/ccm,mike-tr-adamson/ccm,pcmanus/ccm,bcantoni/ccm,mike-tr-adamson/ccm,mikefero/ccm,tolbertam/ccm