Revert "Konfliktbehebung"

This reverts commit c768a8fc6be53a2cfda928e4d66e144068687764, reversing
changes made to f2a2fe2b017115c5ccafdb8ac70887b978cd628f.