Revert "Instrumentation of RPC layer"

This reverts commit cf071843b826e31901bc3670d082116998450c32.