Comment 8 for bug 1834718

@Jeff, the caffeine must not have kicked in when I looked at this. I must have been looking at the master branch instead of the 5.1 branch. I did test your fix on 5.1 and it does resolve the issue.