Revert "Micro-improvment, Windows optimization."

This reverts commit adb064f6684f6284f39fc8b0960163952cb1683e.