This reverts commit 6237f9aa.
Closes #912 Merge request studip/studip!2367
Closes #1241 Merge request !756