Prevent escaping issue with WYSIWYG field

This reverts the previous change. However, there will be a better fix utilising the new escape method.