Comment 20 for bug 1736390

@Greg, do you happen to know which commit in that merge is the actual fix for this bug?