Comment 67 for bug 1198465

Haven't gotten any feedback on this yet, but that's understandable with the holidays. I'm going to push hard to get this bug resolved for 2.8, so I am targeting it as requested.

I think this currently conflicts with a recent minor billing bugfix in master, but I also think we should proceed with testing/developing it as-is, and reintegrate once we get closer to fruition.