This reverts commits 1836bf9e1d and 9fefb9e3cd. The race is reintroduced, and will be fixed later.
1836bf9e1d
9fefb9e3cd