partially revert previous commit ec1da2805cea40434b042c7c5994e987e599ec0f

It breaks windows...