Only call UniVZ if needed (WWW-1594)