Back out a change which is not part of the patch I reviewed and which breaks the list of flags to display on bug and attachment creation - see bug 335389

webtools/bugzilla/template/en/default/flag/list.html.tmpl

@@ -184,7 +184,7 @@
 
   [%# Step 2: Display flag type again (if type is multiplicable). %]
   [% FOREACH type = flag_types %]
-    [% NEXT UNLESS type.is_multiplicable && type.is_active %]
+    [% NEXT UNLESS type.flags && type.flags.size > 0 && type.is_multiplicable && type.is_active %]
     [% IF !separator_displayed %]
         <tr><td colspan="3"><hr></td></tr>
         [% separator_displayed = 1 %]