Comment 74 for bug 1662531

I made those changes before I found this ticket and did them for myself and others locally. I did a quick scan of the tickets to make sure my work wouldn't run into any issues when I eventually tried to submit it back.