Revert "Merge branch 'yannik'"

This reverts commit 503f242bbc48c5154c4e2e0768e4b1c851cafb67, reversing
changes made to 0a9fe309c24f4239fdf889a0393c141f22ee1a4f.