revert [27152] and [27162] closes #3634

git-svn-id: svn://develop.studip.de/studip/trunk@27165 c5b85792-5220-0410-ad23-ed5b6b8ad999