Comment 4 for bug 130222

This is actually not that similar to bug 94321, so I'm pushing it to the next milestone, since it's not completely trivial, and there's already too much work to do this milestone.