Revert "Attempt to fix eventual deadlock"

This reverts commit c6dae4b6815157c2ac2935cd0a2e1c19a01f9048.