Avoid this thread being started and stranded in the forkit.

Change-Id: Ia79cdac729a85960c2b5a83af265d67af07b74aa