Revert "Merge branch 'karol'"

This reverts commit 89c6c83b6a97d968c994ee113d17acb40ec27a6c, reversing
changes made to 678ff32b90870599ba14e6bb107857666799bd68.