Fix incorrect escaping
This reverts commit f2cf82ee.
Apparently f2cf82ee contains some bugs that cause #534 (closed). Further investigation shows that it doesn't seem to be needed anymore since something - maybe !443 (merged) - fixed the root cause
Fixes #534 (closed).