Revert "Disabled trace temporarily per Nate"

This reverts commit e053a8fdfd8b66769dfe720df884700d6c62850a.
Revert "Fixed trace/tag excessive output issue"

This reverts commit 0212c4193f77b07e00aa90bce9e051567f1f3790.