Revert most of r37534, which was an over-revert: just changing addQuotes() back to...