This reverts commit 10232acdfe. The problem was really in the trace code, but it got fixed by "accident" when I had similar problems in hipnotic a couple of years later. Now to figure out just what the trace could really should be doing.
10232acdfe