Fixes #6711
Based on https://github.com/owncloud/core/pull/30149/commits/f0fb21cf3563088284c56be4eac48c7d9725cb21



Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>