Comment 7 for bug 1385382

Yes, I'd put the workaround in place. I can try and get this landed in customizatoon-hooks as well if it's desired, but if the workaround is enough, we should be good for now