Removed useless workaround for windows