caused many build problems on Windows; too late to do this change This reverts commit 1dbaab9692545a9c8c032a886932a7626e48dbe9.