Commit dd2ae0ae got lost during merge, reintroducing the race condition.