Comment 8 for bug 1572237

I've reviewed William's changes with him in a hangout and feel comfortable with his proposed solution. He is handing off the bug to me and I hope to have a patch up today based on his work.