This reverts commit f6fce6bd31.
f6fce6bd31
This reverts commit d9671faca7.
d9671faca7
1. Contains potential deadlock
nb!