Re-apply d8e4676dc10e (bug 510553) to trace-test.py. Changeset c3648b2ea86c inadverte...