Merge "Remove unused tracing; it confuses investigators" into tm-qpr-dev