Fix regressions in previous patches (FS#39609)


git-svn-id: file:///srv/repos/svn-community/svn@109206 9fca08f4-af9d-4005-b8df-a31f2cc04f65
archrelease: copy trunk to community-testing-i686, community-testing-x86_64

git-svn-id: file:///srv/repos/svn-community/svn@109207 9fca08f4-af9d-4005-b8df-a31f2cc04f65