Otherwise the Windows builds hang forever waiting for the process to
terminate.

(cherry picked from commit 9cbfe086)