Undo Util.escape removal