Also remove the previous escaping that took care of RTF only.

Change-Id: Ie9a019912f83a3f56ef52429855cd72cf2c8f463