Revert "Some concurrency updates"

This reverts commit 669a2c83283350d1c079c19cf1ceb6e28e2a5c11.