CRM-15308 Too aggressive on filtering on add_form_button_html.  Reverting to previous code.