Revert "Merge branch 'dev/christian'"

This reverts commit 138dc0f491fef4ed5cfe9f90a9d363f250a44d8a, reversing
changes made to 393ebccaa8bf082f22f534d01455cd385e8667b3.