Revert "More escaping"

This reverts commit c46eaca91247ccf8e6fb3b691dad028e1b084ae3.