Actually ended up finishing bug 941158
Filed bug 967566 yesterday
Investigating bug 964738