Backout Bug 1015226: When using field-label.html.tmpl there is not a way to…

template/en/default/bug/field-label.html.tmpl

@@ -16,21 +16,12 @@
   #%]
 
 [% DEFAULT tag_name = "th" %]
-[% DEFAULT field_name = field_descs.${field.name} FILTER html %]
-
 <[% tag_name FILTER html %] class="field_label [% ' bz_hidden_field' IF hidden %]
            [%- ' required' IF field.is_mandatory && NOT bug.id %]"
     id="field_label_[% field.name FILTER html %]"
     [% IF rowspan %] rowspan="[% rowspan FILTER html %]"[% END %]>
 
   [% IF editable %]
-    [%# Underline the accesskey if defined and found in the field name %]
-    [% IF accesskey %]
-      [% matches = field_name.match("(?i)($accesskey)") %]
-      [% IF matches.0 %]
-        [% field_name = field_name.replace(matches.0, "<u>${matches.0}</u>") %]
-      [% END %]
-    [% END %]
     <label for="[% field.name FILTER html %]"[% IF accesskey %] accesskey="[% accesskey FILTER html %]"[% END %]>
   [% END %]
 
@@ -44,7 +35,7 @@
     [% ELSE %]
       href="page.cgi?id=fields.html#[% field.name FILTER uri %]"
     [% END %]
-  >[%- field_name FILTER none %]:</a>
+  >[%- field_descs.${field.name} FILTER html %]:</a>
 
   [% '</label>' IF editable %]
 </[% tag_name FILTER html %]>