Comment # 3 on bug 1216919 from Robert Munteanu

https://build.opensuse.org/request/show/1124303 contains the needed follow-up
fixes.