Comment 24 for bug 1808418

Oh it's a merge point so there are still some commits:
$ git diff e5770b7bdbfe..32c1431eea48

So probably a good idea to bisect between e5770b7bdbfe and 32c1431eea48.