Putting back escaping HTML from the previous commit. Needs more thought.