Comment 11 for bug 1639226

Still attacking this bug from multiple angles, and some angles require multiple branches. So you'll see a bunch of branches attached to the bug before it's resolved.