3798 Remove html_safe now that the html is gone