Moved this patch to my other PR  so that this PR has only the quotes change.