Partially reverting e4a4efdb42 to keep MSVS compatibility.