We can here also simply revert https://github.com/owncloud/core/pull/22468 and https://github.com/owncloud/core/pull/22432 🙈