This issue is already being handled as a part of work on a patch for https://bugzilla.suse.com/show_bug.cgi?id=1045180