Back out part of rev 1.24. The intention the quoting backfires and bad