Reverts use-statement and resulting stuff
Reverts use-statement and resulting stuff

This is not part of the PR to fix the unittests. This should be done in
a separate - and then consequent - PR to resolve the namespaces

akrabat/joindin-api,lornajane/joindin-api,joindin/joindin-api,joindin/joindin-api,heiglandreas/joindin-api,railto/joindin-api,dstockto/joindin-api,heiglandreas/joindin-api,dstockto/joindin-api,railto/joindin-api,railto/joindin-api,lornajane/joindin-api,heiglandreas/joindin-api,dstockto/joindin-api,lornajane/joindin-api,joindin/joindin-api,akrabat/joindin-api,akrabat/joindin-api