I am on oC10 core stuff at the moment. This can wait until the "flaky smoke test" stuff is sorted out. This is only rewording to tidy things up. I need to look and see what rubbish I did in the refactoring commit https://github.com/owncloud/web/pull/6077/commits/4e8674250333e046d66cb27779d5fdaf00a1a95d