Comment 16 for bug 2049217

Thanks for the feedback Andreas. I left some comments on the MP, but I wanted to comment here too for visibility. Perhaps I made things confusing trying to fix the situation in upstream only. If it's easier/better this way, I've attached a minimal diff that will provide the changes needed to fix the package right now and then we can discard the delta once the upstream changes have been made later.