Revert "Fix bug ZK-1587"