Comment 4 for bug 1717615

This is Mitaka heat, so we won't have that change in place. That's a much better fix than working around it in charms though.

Any chance of a backport?