Revert a bit of too much escaping