Comment 10 for bug 1724348

I plan to review this in light of recent changes to bug #1797923 and #1731272, and see if this branch still makes sense, and what else might need to be pulled in from the branch in #1731272, if anything.