Revert "Merge branch 'master' into karol"

This reverts commit 38107f8c26d98103746e55aba9e1aab395e6b332, reversing
changes made to 4b56ac1ac0341d8cb9d2c1449708376d5ad491ef.