I was thinking about adding a switch to disable concurrency and leaving this section for non-concurrent scenario. But was not sure what's best decision to take.

For the purpose of reviweing/testing the patch this gives a quick way to switching between the current and the new implementation. I admit I could give a better name to the conditional :)