I don't know if removing "if (!start_routine_)" from ThreadStart is NFC. This reverts commit b3267bb3.