Comment 10 for bug 1789161

Here's the working patch I have (it took me so long to test it because I hit
some sort of 4.18 kernel regression in mainline that made it not possible for
me to boot -- I'm going to go and bisect what's going on there now).