Revert "Revert "Revert "cviceni 8"""

This reverts commit 52b092bea9d67af2256abab042c72b20c632c9ea.