Revert "4.5.4.1-Linux Windows compatible"

This reverts commit 90ba96a131d3319a2cb66a958dd866f8a820b5ab.