This commit reverts some of the previous commit to be more amenable for
adding a feature feature flag to avoid introducing a bug in the CI live
trace functionality.