Revert "Improve the slow query instrumentation."

This reverts commit 89101cd9d9b5c1a6ff1ed85eba0613ca4c4802e2.
7 files changed