MBS-4522: use simpler conditional pointed out by ocharles