Revert "Err nasty dead-lock..."

This reverts commit 72a346c198c4ee03e31a874311786fd69ca999be.
Revert "Limit number of outstanding directory propagation processes."

This reverts commit 6a578a78d0cf55d5a614e2818e8d0e0d28bee3a5.