#24215: also back out changeset that broke test_trace in 3.4.

I missed that this change was applied to both branches.