Revert "Revert "Revert "Komandir"""

This reverts commit 238f0defb8b09562a1407e43ceb51bb4139c670f.