Applied patch from openSUSE build to revert some build problems