LPS-34801 remove double escaping