Change in ovirt-engine[master]: Revert "core: fix NPE is Challenger"