Comment 5 for bug 1564776

This bug can be closed, since alternate patches have merged upstream that addressed the same problem.