This reverts commits 85a1eda5 (#15792) and c495bca4 (#15787)
because they introduce database writes during tracing.