This should no longer be required on Windows