reversion of previous state

Remove wrong usage of SafeHtmlUtils