Revert "Merge branch 'seb' of ssh://synlos.net/entitymanager into dev"
This reverts commit 2c89eb94005a9c61337ede9cb858dfb467d3f251, reversingchanges made to 55dc7c8e7203a1f5aadee49ec9693b47d0008928.