Revert "- fix bug #61504, fix build errors on windows and possibly other"

This reverts commit 74ee335.

Author: cataphract