Put back HTML escaping of trace names removed in r16062.