Revert "Various changes by Philipp Gühring"