Comment 3 for bug 2044143

Thanks for the background. Feel free to discard my PR. But I'd suggest keeping this bug report and linking it to your Gerrit change, so that there's a paper trail in case others notice the bug, too.