Comment 22 for bug 1988711

Update: Everything applied fine, but my PR got kicked back again because they didn't like how I did it (I ended up doing a single commit with all the patches, so I need to now go back and redo this with a commit for each individual patch)

I'll work on that today and tomorrow and try to get a new PR by friday afternoon.