This would be the quickest and easiest fix for us currently, IMHO: https://build.opensuse.org/request/show/506895