Comment 5 for bug 1683575

Just FYI I have a patch/fix for this but it's based on a branch that has yet to hit master (see comment # on bug 1685929)... so in an effort to reduce conflicts and extra merge work for whomever gets to merge that, it should wait until that branch hits master.

Branch link to follow.