Comment 4 for bug 850461

This hybrid plan works for me. I'd always welcome a third perspective, but I'm comfortable getting this into master, pending actual testing. If it backports cleanly to 2.0, I can run some live tests today. If not, it may be a week or two before I get time to test this thoroughly.

Thanks!