Comment 2 for bug 1084138

I actually did a branch that implements this during the Folsom RC cycle. It just didn't make the cut....

It did something very similar to what Ken outlines above.

Let me see if I can resurrect the code and put a new patch up for review.