Code reorg and major rollback to old concurrency model, not supporting timeouts temporarily.

The old concurrency model has a few race conditions that were causing
boom to crash. The code was quite complex for what it has been doing,
so I'm reverting it back to our initial model.