Revert escaping change which broke a bunch of stuff

Revisit this as Strophe change