Added support for unquoting without decoding