This reverts commit 21d3b87943.
21d3b87943
Let's try to include time spent in the DB threads in the per-request/block cpu usage metrics.