Fix cross-board threads replacing local threads.