Attempt to quote anyway if unquoting fails

Fixes #2356

TODO

- [ ] Add test