Unnecessary?

Broke on Windows
Revert "Revert e0d4b82..7f33c51"

This reverts commit d76816d66a17373fea57aeb5002c0917bc8c094e.