Revert r185229 as it breaks compilation of <windows.h>