Second attempt to fix WinEHCatchDirector build failures.