Comment 2 for bug 2063849

Whoops, I neglected to mention: This work is perched atop the branch for bug 2062917. So it's 1 commit from that bug, then 5 commits for this one, making a total of 6 commits you'll need to try this development out.