Revert "More Windows build fixes, some tidying in mojo_main"

This reverts commit c2d46e5a3882f80ffa3d8d50a39fa0b5a1271628.