Comment 2 for bug 1840852

Makes sense to me, and didn't break anything with the tests. Pushed to master for future happy testing. Might be simple enough to backport without any penalty too, but not touching it for now.