Revert "Fix unmarshal for escaped strings."
Revert "Fix unmarshal for escaped strings."

This reverts commit 581255bf23af90b77bb2b6e2671b40e2b565754e.

gingerBill/Odin,gingerBill/Odin,gingerBill/Odin,gingerBill/Odin