Revert "Improved previous patch so it really solves the Windows issue."

This reverts commit e80116c813ecfc8cde094cddd36a3b083c108fd8.